X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=26164067dbc47b77389b0ded4b61980761226418;hb=7684f83e49bdc4d883e682abd922a7722cf996c4;hp=9387ee3b8e9d2e06a86b5e50e821f56e0dfb3140;hpb=ac3fd2f34f0e3c9555afcd8fc71b90f04b27e658;p=dgit.git

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 9387ee3b..26164067 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -275,7 +275,7 @@ sub policyhook {
     debugcmd '+',@cmd;
     my $r = system @cmd;
     die "system: $!" if $r < 0;
-    die "hook (".(shellquote @cmd).") failed ($?)"
+    die "dgit-repos-server: policy hook failed (or rejected) ($?)\n"
 	if $r & ~($policyallowbits << 8);
     printdebug sprintf "hook => %#x\n", $r;
     return $r >> 8;
@@ -499,7 +499,7 @@ sub parsetag () {
 	    while (length) {
 		if (s/^distro\=(\S+) //) {
 		    die "$1 != $distro" unless $1 eq $distro;
-		} elsif (s/^(--deliberately-$package_re) //) {
+		} elsif (s/^(--deliberately-$deliberately_re) //) {
 		    push @deliberatelies, $1;
 		} elsif (s/^supersede:(\S+)=(\w+) //) {
 		    die "supersede $1 twice" if defined $supersedes{$1};
@@ -920,9 +920,9 @@ sub parseargsdispatch () {
 	exit 0;
     }
 
-    $distro = $ENV{'DGIT_DRS_DISTRO'}     = argval();
-    $distrodir                            = argval();
-    $keyrings = $ENV{'DGIT_DRS_KEYRINGS'} = argval();
+    $distro    = argval();
+    $distrodir = argval();
+    $keyrings  = argval();
 
     foreach my $dk (keys %indistrodir) {
 	${ $indistrodir{$dk} } = "$distrodir/$dk";