dgit-repos-server: Don't crash on --quilt=baredebian

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 65fda22d7ed76808337bf68b9385f65bd2a814a4..177829e9aeffce5ccd60a3e9a832f427c1623fa5 100755 (executable)
--- 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;
@@ -1252,6 +1252,16 @@ END
 
     runcmd qw(git checkout -q), "refs/tags/$tagval";
 
+    my $clogp = parsechangelog();
+    my $clogf = sub {
+       my ($f, $exp) = @_;
+       my $got = getfield $clogp, $f;
+       return if $got eq $exp;
+       reject "mismatch: changelog $f $got != $exp";
+    };
+    $clogf->('Version', $version);
+    $clogf->('Source',  $package);
+
     @fetch = (@dgit, qw(fetch), $suite);
     debugcmd "+",@_;
     $!=0; $?=-1;
@@ -1272,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;