X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=811db69dd38021c3cb845ec781f6f8e81903cdfd;hb=f50450ae5e1ee0b122570dd17f7839f46ecbee92;hp=828ab7a14b66ec4cff9a9404e3a3bf4053620198;hpb=56dac689f66baa1d9e5c2e25dd2f5ef78fdb1db2;p=dgit.git

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 828ab7a1..811db69d 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -1132,7 +1132,7 @@ sub mode_tag2upload () {
 
 	# quick and dirty check, will check properly later
 	m/^\[dgit[^"]* please-upload(?:\]| )/m or
-	    $quit->("tag missing please-upload request $_");
+	    $quit->("tag missing please-upload request");
 
 	m/^tagger (.*) \d+ [-+]\d+$/m or
 	    $quit->("failed to fish tagger out of tag");
@@ -1149,7 +1149,6 @@ sub mode_tag2upload () {
 
     # This is for us.  From now on, we will capture errors to
     # be emailed to the tagger.
-    # TODO: failures to git fetch from salsa will burn a version
 
     open H, ">>dgit-tmp/tagupl.email" or die $!;
     print H <<END or die $!;
@@ -1189,14 +1188,15 @@ END
                 -f$ENV{DGIT_DRS_EMAIL_NOREPLY}        \\
                 <tagupl.email
 END
-	exit 0;
+	$quit->("failed, emailed");
     }
 
     open STDERR, ">&L" or die $!;
     open STDOUT, ">&STDERR" or die $!;
     open DEBUG, ">&STDERR" if $debuglevel;
 
-    die "$tagmversion != $version " unless $tagmversion eq $version;
+    reject "version mismatch $tagmversion != $version "
+	unless $tagmversion eq $version;
 
     my %need = map { $_ => 1 } qw(please-upload split);
     my ($upstreamc, $upstreamt);