From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 29 Jan 2014 18:53:43 +0000 (+0000)
Subject: dgit-repos-server: wip fixes
X-Git-Tag: debian/0.22~73
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ae269e862c21b2806e1039fb69c4ef9f67bb13b6;ds=sidebyside

dgit-repos-server: wip fixes
---

diff --git a/dgit-repos-server b/dgit-repos-server
index 8d821861..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";
 }
 
@@ -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;