diff options
| -rwxr-xr-x | iurt_root_command | 2 | ||||
| -rwxr-xr-x | ulri | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/iurt_root_command b/iurt_root_command index 8b5ef30..70dd08e 100755 --- a/iurt_root_command +++ b/iurt_root_command @@ -35,7 +35,7 @@ my (@params, %run); $run{program_name} = $program_name; my %authorized_modules = ('unionfs' => 1); -my %authorized_rw_bindmounts = ( map { $_ => 1 } qw(/proc /dev/pts /var/cache/icecream) ); +my %authorized_rw_bindmounts = (map { $_ => 1 } qw(/proc /dev/pts /var/cache/icecream)); $run{todo} = []; @params = ( @@ -499,7 +499,7 @@ foreach my $prefix (keys %pkg_tree) { } my $to = get_author_email($user) || "Unknown <$config->{admin}>"; - my $cc = undef; + my $cc; my $fpath = "$config->{http_queue}/failure/$path/$prefix"; $fpath =~ tr!/!!s; # Squash double slashes ... $fpath =~ s!/!//!; # ... except for http:// @@ -511,7 +511,7 @@ foreach my $prefix (keys %pkg_tree) { opendir my $DP1, "$fail_dir/$prefix/log/"; foreach my $f1 (readdir $DP1) { - if (! -d "$fail_dir/$prefix/log/$f1" or $f1 =~ m/^\./) { + if (! -d "$fail_dir/$prefix/log/$f1" || $f1 =~ m/^\./) { next; } @@ -684,7 +684,7 @@ foreach my $prefix (sort keys %pkg_tree) { } plog('DEBUG', "Build $pkgs"); - ssh($remote, "\'echo PID=\$\$; exec $cmd $pkgs &>$prefix_dir/log/botcmd.\$(date +%s).\$(hostname -s).log\' > $temp &"); + ssh($remote, "'echo PID=\$\$; exec $cmd $pkgs &>$prefix_dir/log/botcmd.\$(date +%s).\$(hostname -s).log' > $temp &"); # wait 10 seconds or until we have the log file # plus 20 seconds if it timeouts. |