From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Oct 2016 11:12:04 +0000 (+0100)
Subject: dgit: Improve two error messages relating to .changes handling and sbuild
X-Git-Tag: archive/debian/2.0~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c753c8249e88196452dd55dbd8a5701dcd4c6740;p=dgit.git

dgit: Improve two error messages relating to .changes handling and sbuild

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 5bd39e70..deb77e06 100755
--- a/dgit
+++ b/dgit
@@ -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");