dgit-repos-server: parsetag: Print a bit more debug about junk

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

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index b853162812981d0f03634589c3f6af8535ab4f28..f75d7e527ea28dc14582fa0da1ad92a6cacadfdb 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -591,7 +591,8 @@ sub parsetag_general ($$) {
                if ($dgititemfn->()) {
                } elsif (s/^distro\=(\S+) //) {
                    $distrofn->($1);
-               } elsif (s/^[-+.=0-9a-z]\S* //) {
+               } elsif (s/^([-+.=0-9a-z]\S*) //) {
+                   printdebug " parsetag ignoring unrecognised \`$1'\n";
                } else {
                    die "unknown dgit info in tag ($_)";
                }
@@ -1073,7 +1074,6 @@ 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
@@ -1283,7 +1283,8 @@ 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";
        }
     }