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

diff --git a/dgit-repos-server b/dgit-repos-server
index 11e4569e..ad4cde56 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,19 +149,22 @@ 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 $!;
+	chomp $why;
+	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 +221,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 $!;
     }
@@ -446,6 +451,14 @@ sub checksuite () {
     reject "unknown suite";
 }
 
+sub tagh1 ($) {
+    my ($tag) = @_;
+    my $vals = $tagh{$tag};
+    reject "missing tag $tag in signed tag object" unless $vals;
+    reject "multiple tags $tag in signed tag object" unless @$vals == 1;
+    return $vals->[0];
+}
+
 sub checks () {
     debug "checks";
     checksuite();
@@ -480,7 +493,6 @@ sub onwardpush () {
 
 sub stunthook () {
     debug "stunthook";
-    print Dumper(\$ENV{GIT_DIR});
     chdir $workrepo or die "chdir $workrepo: $!";
     mkdir "dgit-tmp" or $!==EEXIST or die $!;
     readupdates();
@@ -540,7 +552,13 @@ sub parseargsdispatch () {
 	defined($destrepo = $ENV{'DGIT_DRS_DEST'}) or die;
 	defined($keyrings = $ENV{'DGIT_DRS_KEYRINGS'}) or die $!;
 	open STDOUT, ">&STDERR" or die $!;
-	stunthook();
+	eval {
+	    stunthook();
+	};
+	if ($@) {
+	    recorderror "$@" or die;
+	    die $@;
+	}
 	exit 0;
     }