X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-repos-server;h=11e4569e72abedb577a5d560f012abc3b4f24251;hp=8dd36aee27458ca4b97ad9ad4e0dfdb6227c1370;hb=ae269e862c21b2806e1039fb69c4ef9f67bb13b6;hpb=4b4f00a653167584f83051e2cee73724b6fd1a3b

diff --git a/dgit-repos-server b/dgit-repos-server
index 8dd36aee..11e4569e 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,7 +149,7 @@ sub mkrepotmp () {
     die $!;
 }
 
-sub reject ($) {
+sub recordreject ($) {
     my ($why) = @_;
     my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
     if (defined $w) {
@@ -157,6 +157,11 @@ sub reject ($) {
 	print REJ $why, "\n" or die $!;
 	close REJ or die $!;
     }
+}
+
+sub reject ($) {
+    my ($why) = @_;
+    recordreject $why;
     die "dgit-repos-server: reject: $why\n";
 }
 
@@ -311,7 +316,7 @@ sub parsetag () {
 	}
     }
     $!=0; $_=<T>; defined or die $!;
-    m/^($package_re) release (\S+) for (\S+) \[dgit\]$/ or
+    m/^($package_re) release (\S+) for \S+ \((\S+)\) \[dgit\]$/ or
 	reject "tag message not in expected format";
 
     die unless $1 eq $package;
@@ -344,13 +349,16 @@ sub checksig_keyring ($) {
 
     debug " checksig keyring $keyringfile...";
 
-    open P, "-|", (qw(gpgv --status-fd=1 --keyring),
+    our @cmd = (qw(gpgv --status-fd=1 --keyring),
 		   $keyringfile,
-		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext))
+		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext));
+    debugcmd @cmd;
+
+    open P, "-|", @cmd
 	or die $!;
 
     while (<P>) {
-	next unless s/^\[GNUPG:\]: //;
+	next unless s/^\[GNUPG:\] //;
 	chomp or die;
 	debug " checksig| $_";
 	my @l = split / /, $_;
@@ -425,7 +433,7 @@ sub verifytag () {
 }
 
 sub checksuite () {
-    debug "checksuite";
+    debug "checksuite ($suitesfile)";
     open SUITES, "<", $suitesfile or die $!;
     while (<SUITES>) {
 	chomp;
@@ -514,6 +522,9 @@ sub argval () {
 sub parseargsdispatch () {
     die unless @ARGV;
 
+    delete $ENV{'GIT_DIR'}; # if not run via ssh, our parent git process
+    delete $ENV{'GIT_PREFIX'}; # sets these and they mess things up
+
     if ($ENV{'DGIT_DRS_DEBUG'}) {
 	$debug='=';
 	open DEBUG, ">&STDERR" or die $!;