summaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-02 20:10:03 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:09 +0100
commitc02c4c21a1ae474acf22b09b400081d4e21fb149 (patch)
tree8e9de6253a0d1e3dfefe0965e1c7784fdecf429e /infra
parentcb5dfd5817329930d923aa005d6cf3b9c424656d (diff)
dgit-repos-server: Use shellquote() where appropriate in diagnostics
Diffstat (limited to 'infra')
-rwxr-xr-xinfra/dgit-repos-server9
1 files changed, 5 insertions, 4 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 63f9aac..7925d04 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -263,7 +263,7 @@ sub runcmd {
debugcmd '+',@_;
$!=0; $?=0;
my $r = system @_;
- die "@_ $? $!" if $r;
+ die (shellquote @_)." $? $!" if $r;
}
sub policyhook {
@@ -274,8 +274,9 @@ sub policyhook {
debugcmd '+',@cmd;
my $r = system @cmd;
die "system: $!" if $r < 0;
- die "hook (@cmd) failed ($?)" if $r & ~($policyallowbits << 8);
- printdebug sprintf "hook (%s) => %#x\n", "@polargs", $r;
+ die "hook (".(shellquote @cmd).") failed ($?)"
+ if $r & ~($policyallowbits << 8);
+ printdebug sprintf "hook (%s) => %#x\n", (shellquote @polargs), $r;
return $r >> 8;
}
@@ -889,7 +890,7 @@ sub parseargsdispatch () {
if ($ARGV[0] eq '--pre-receive-hook') {
if ($debuglevel) {
$debugprefix.="=";
- printdebug "in stunthook @ARGV\n";
+ printdebug "in stunthook ".(shellquote @ARGV)."\n";
foreach my $k (sort keys %ENV) {
printdebug "$k=$ENV{$k}\n" if $k =~ m/^DGIT/;
}