aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-25 07:49:22 +0000
committerOlivier Blin <blino@mageia.org>2010-11-25 07:49:22 +0000
commit96dfcae3b9c80a6d69a93c8a517923d5ed96e21a (patch)
tree0bfb973d77073f17e3c2bb9e7bb4432342429fc5
parentbdf484a2bd0162ad9573d297f0a4fbd671992d9f (diff)
downloadiurt-96dfcae3b9c80a6d69a93c8a517923d5ed96e21a.tar
iurt-96dfcae3b9c80a6d69a93c8a517923d5ed96e21a.tar.gz
iurt-96dfcae3b9c80a6d69a93c8a517923d5ed96e21a.tar.bz2
iurt-96dfcae3b9c80a6d69a93c8a517923d5ed96e21a.tar.xz
iurt-96dfcae3b9c80a6d69a93c8a517923d5ed96e21a.zip
iurt log path is now passed by ulri when running the iurt command through ssh
-rwxr-xr-xulri3
1 files changed, 1 insertions, 2 deletions
diff --git a/ulri b/ulri
index 542c5c5..278465f 100755
--- a/ulri
+++ b/ulri
@@ -668,7 +668,6 @@ foreach my $prefix (sort keys %pkg_tree) {
$cmd =~ s!__DIR__!$path/$prefix!g;
$cmd =~ s!__TARGET__!$target!g;
$cmd =~ s!__PACKAGER__!$user!g;
- $cmd =~ s!__IURTLOGDIR__!$prefix_dir/log/!g;
my $media_to_add;
if (ref $config->{media}{$target}{$media}) {
@@ -680,7 +679,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, "\'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.