X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=7ec09de85d5932edccdd4b1308f38b505aa41e69;hp=91f43af087372c02b0f6ad719f93a60b07a94002;hb=81aaaee0875d911dca013460b1087e5b56922c0f;hpb=6b6d2e426e5ee6b08c706d57db7502d80e00e82b

diff --git a/dgit b/dgit
index 91f43af0..7ec09de8 100755
--- a/dgit
+++ b/dgit
@@ -155,7 +155,7 @@ END {
     local ($?);
     foreach my $f (@end) {
 	eval { $f->(); };
-	warn "$us: cleanup: $@" if length $@;
+	print STDERR "$us: cleanup: $@" if length $@;
     }
 };
 
@@ -1706,7 +1706,7 @@ sub clone ($) {
     canonicalise_suite();
     badusage "dry run makes no sense with clone" unless act_local();
     my $hasgit = check_for_git();
-    mkdir $dstdir or die "$dstdir $!";
+    mkdir $dstdir or fail "create \`$dstdir': $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
     my $giturl = access_giturl(1);
@@ -2083,7 +2083,7 @@ END
 	sign_changes $changesfile;
     }
 
-    supplementary_message(<<'END');
+    supplementary_message(<<END);
 Push failed, while uploading package(s) to the archive server.
 You can retry the upload of exactly these same files with dput of:
   $changesfile
@@ -3058,7 +3058,7 @@ sub massage_dbp_args ($;$) {
     push @newcmd, '-nc';
     # and some combinations of -S, -b, et al, are errors, rather than
     # later simply overriding earlier
-    push @newcmd, '-F' unless grep { m/^-[bBASF]$/ } (@$cmd, @$xargs);
+    push @newcmd, '-F' unless grep { m/^-[bBASFgG]$/ } (@$cmd, @$xargs);
     push @newcmd, @$cmd;
     @$cmd = @newcmd;
 }
@@ -3109,11 +3109,11 @@ sub build_source {
     $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
     $dscfn = dscfn($version);
     if ($cleanmode eq 'dpkg-source') {
-	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
-	    changesopts();
+	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
+			       changesopts();
     } elsif ($cleanmode eq 'dpkg-source-d') {
-	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S -d)),
-	    changesopts();
+	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
+			       changesopts();
     } else {
 	my $pwd = must_getcwd();
 	my $leafdir = basename $pwd;
@@ -3153,11 +3153,20 @@ sub cmd_sbuild {
 	    or $a cmp $b
     } @changesfiles;
     fail "wrong number of different changes files (@changesfiles)"
-	unless @changesfiles;
+	unless @changesfiles==2;
+    my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
+    foreach my $l (split /\n/, getfield $binchanges, 'Files') {
+	fail "$l found in binaries changes file $binchanges"
+	    if $l =~ m/\.dsc$/;
+    }
     runcmd_ordryrun_local @mergechanges, @changesfiles;
     my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
     if (act_local()) {
 	stat_exists $multichanges or fail "$multichanges: $!";
+	foreach my $cf (glob $pat) {
+	    next if $cf eq $multichanges;
+	    rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
+	}
     }
     printdone "build successful, results in $multichanges\n" or die $!;
 }