Tests: Introduce t-set-using-tmp and use it in lib and adhoc

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 1492794e4088b0154820d557305dbbd3c9c424d9..26164067dbc47b77389b0ded4b61980761226418 100755 (executable)
--- 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};