aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Leitner <mrl@mandriva.com>2007-06-26 18:16:04 +0000
committerMarcelo Leitner <mrl@mandriva.com>2007-06-26 18:16:04 +0000
commitbf1314d97965db358a0faa79ccb03500cfef36d0 (patch)
treeaf3960cdc7fcd78d7ac6c79538347e106e2ebdbc
parent94cee39014eff1cfec99ce394035e36dc02aa9e9 (diff)
downloadiurt-bf1314d97965db358a0faa79ccb03500cfef36d0.tar
iurt-bf1314d97965db358a0faa79ccb03500cfef36d0.tar.gz
iurt-bf1314d97965db358a0faa79ccb03500cfef36d0.tar.bz2
iurt-bf1314d97965db358a0faa79ccb03500cfef36d0.tar.xz
iurt-bf1314d97965db358a0faa79ccb03500cfef36d0.zip
- Enhance job abandoning message.
- Do not redirect stderr to pidfile, otherwise ssh messages will be logged too.
-rwxr-xr-xulri7
1 files changed, 5 insertions, 2 deletions
diff --git a/ulri b/ulri
index 9b7c870..69b9ff2 100755
--- a/ulri
+++ b/ulri
@@ -645,7 +645,7 @@ foreach my $prefix (sort keys %pkg_tree) {
$cmd =~ s!__MEDIA__!$media_to_add!g;
plog('DEBUG', "Build $pkgs");
- ssh($remote, "$cmd $pkgs &> $temp &");
+ ssh($remote, "$cmd $pkgs > $temp &");
# wait 10 seconds or until we have the log file
# plus 20 seconds if it timeouts.
@@ -663,7 +663,10 @@ foreach my $prefix (sort keys %pkg_tree) {
my $pid = get_pid_from_file($temp);
unlink $temp;
plog('DEBUG', "remote pid $pid");
- last unless $pid;
+ if (!$pid) {
+ plog('WARN', "pid is unknown, abandoning the build.");
+ last;
+ }
# create lock file
#