chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dgit.pm: Introduce $deliberately_re and use it everywhere
[dgit.git]
/
infra
/
dgit-repos-server
diff --git
a/infra/dgit-repos-server
b/infra/dgit-repos-server
index 9387ee3b8e9d2e06a86b5e50e821f56e0dfb3140..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;
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;
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;
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};
push @deliberatelies, $1;
} elsif (s/^supersede:(\S+)=(\w+) //) {
die "supersede $1 twice" if defined $supersedes{$1};
@@
-920,9
+920,9
@@
sub parseargsdispatch () {
exit 0;
}
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";
foreach my $dk (keys %indistrodir) {
${ $indistrodir{$dk} } = "$distrodir/$dk";