diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-22 09:05:54 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-22 09:05:54 +0100 |
commit | 2fc7f4f9df2771b5650ecfd93d0acd9a146a5e72 (patch) | |
tree | 04ded5efa88ad0ca382d82c56918688e1053ace8 /dgit | |
parent | 50037b9cbca5acfe285c5d67968ada20ee3e2ce9 (diff) |
more fixes for error handling, @cmds
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -281,7 +281,7 @@ sub parsecontrol { sub parsechangelog { my $c = Dpkg::Control::Hash->new(); my $p = new IO::Handle; - my @cmd = qw(dpkg-parsechangelog); + my @cmd = (qw(dpkg-parsechangelog)); open $p, '-|', @cmd or die $!; $c->parse($p); $?=0; $!=0; close $p or failedcmd @cmd; @@ -329,12 +329,12 @@ sub archive_query_sshdakls ($$) { sub canonicalise_suite_sshdakls ($$) { my ($proto,$data) = @_; $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'"; - my @cmd = - access_cfg('ssh'), $`, - "set -e; cd $';". - " if test -h $isuite; then readlink $isuite; exit 0; fi;". - " if test -d $isuite; then echo $isuite; exit 0; fi;". - " exit 1"; + my @cmd = + (access_cfg('ssh'), $`, + "set -e; cd $';". + " if test -h $isuite; then readlink $isuite; exit 0; fi;". + " if test -d $isuite; then echo $isuite; exit 0; fi;". + " exit 1"); my $dakls = cmdoutput @cmd; failedcmd @cmd unless $dakls =~ m/^\w/; return $dakls; |