X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=177829e9aeffce5ccd60a3e9a832f427c1623fa5;hb=b5e24ca3bdd371aa72e8bd095f86f0b3cbfbbee1;hp=d8dc8574bd2157a4a5d4b4e7e53984448ad1ebcf;hpb=c023de1aef27e1ff1170ed1b4310f205c7118856;p=dgit.git

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index d8dc8574..177829e9 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -1073,10 +1073,10 @@ our @hookenvs = qw(distro suitesfile suitesformasterfile policyhook
 # workrepo and destrepo handled ad-hoc
 
 sub mode_tag2upload () {
-    # PROTOTYPE
     # CALLER MUST PREVENT MULTIPLE CONCURRENT RUNS IN SAME CWD
     # If we fail (exit nonzero), caller should capture our stderr,
     #  and retry some bounded number of times in some appropriate way
+    # Uses whatever ambient gpg key is available
     @ARGV==2 or die;
 
     my $url;
@@ -1282,12 +1282,12 @@ END
     if (defined $quilt) {
 	push @dgitcmd, "--quilt=$quilt";
 	if ($quilt =~ m/baredebian/) {
-	    die "needed upstream commmitish with --quilt=baredebian";
+	    die "needed upstream commmitish with --quilt=baredebian"
+		unless defined $upstreamc;
 	    push @dgitcmd, "--upstream-commitish=$upstreamc";
 	}
     }
     push @dgitcmd, qw(push-source --new --overwrite), $suite;
-    # xxx what about the key to use?
     
     runcmd @dgitcmd;