dgit-repos-server: do drs-error and recorderror, not just for reject

[dgit.git] / dgit-repos-server

diff --git a/dgit-repos-server b/dgit-repos-server
index 6e1ec02f74e639e8841e3f5c8ae8b262cfbfd46f..6acd6894f0eae552b82dbb542761c712612a2f05 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,14 +149,21 @@ sub mkrepotmp () {
     die $!;
 }
 
-sub reject ($) {
+sub recorderror ($) {
     my ($why) = @_;
     my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
     if (defined $w) {
-       open REJ, ">", "$w/drs-reject" or die $!;
-       print REJ $why, "\n" or die $!;
-       close REJ or die $!;
+       open ERR, ">", "$w/drs-error" or die $!;
+       print ERR $why, "\n" or die $!;
+       close ERR or die $!;
+       return 1;
     }
+    return 0;
+}
+
+sub reject ($) {
+    my ($why) = @_;
+    recorderror "reject: $why";
     die "dgit-repos-server: reject: $why\n";
 }
 
@@ -213,10 +220,12 @@ END
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
-    if (open REJ, "<", "$workrepo/drs-reject") {
-       $!=0; my $why = <REJ>;
-       chomp $why or die $!;
-       reject $why;
+    if (open REJ, "<", "$workrepo/drs-error") {
+       local $/ = undef;
+       my $msg = <REJ>;
+       REJ->error and die $!;
+       print STDERR $msg;
+       exit 1;
     } else {
        $!==&ENOENT or die $!;
     }
@@ -311,7 +320,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 +353,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 +437,7 @@ sub verifytag () {
 }
 
 sub checksuite () {
-    debug "checksuite";
+    debug "checksuite ($suitesfile)";
     open SUITES, "<", $suitesfile or die $!;
     while (<SUITES>) {
        chomp;