diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-16 12:12:04 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-16 12:12:04 +0100 |
commit | c753c8249e88196452dd55dbd8a5701dcd4c6740 (patch) | |
tree | 4e8702c68bd153ec91c5339a91daf1d70c61288f /dgit | |
parent | b49092567e74794274ee5c1b1f3939d4cb70d407 (diff) |
dgit: Improve two error messages relating to .changes handling and sbuild
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -4938,9 +4938,10 @@ sub cmd_sbuild { if (!$rmchanges) { my @unwanted = map { s#^\.\./##; $_; } glob "../$pat"; @unwanted = grep { $_ ne changespat $version,'source' } @unwanted; - fail "changes files other than source matching $pat". - " already present (@unwanted);". - " building would result in ambiguity about the intended results" + fail <<END +changes files other than source matching $pat already present; building would result in ambiguity about the intended results. +Suggest you delete @unwanted. +END if @unwanted; } my $wasdir = must_getcwd(); @@ -4956,6 +4957,11 @@ sub cmd_sbuild { ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/) or $a cmp $b } @changesfiles; + fail <<END if @changesfiles==1; +only one changes file from sbuild (@changesfiles) +perhaps you need to pass -A ? (sbuild's default is to build only +arch-specific binaries; dgit 1.4 used to override that.) +END fail "wrong number of different changes files (@changesfiles)" unless @changesfiles==2; my $binchanges = parsecontrol($changesfiles[1], "binary changes file"); |