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

diff --git a/dgit-repos-server b/dgit-repos-server
index 11e4569e72abedb577a5d560f012abc3b4f24251..6acd6894f0eae552b82dbb542761c712612a2f05 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,19 +149,21 @@ sub mkrepotmp () {
     die $!;
 }
 
-sub recordreject ($) {
+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) = @_;
-    recordreject $why;
+    recorderror "reject: $why";
     die "dgit-repos-server: reject: $why\n";
 }
 
@@ -218,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 $!;
     }