diff options
author | Gustavo De Nardin <spuk@mandriva.org> | 2009-08-06 06:57:53 +0000 |
---|---|---|
committer | Gustavo De Nardin <spuk@mandriva.org> | 2009-08-06 06:57:53 +0000 |
commit | 098dd6589b485ea0b6fe329b9b802a30d866cc0e (patch) | |
tree | 2acc1ec0f0b19ffa81b60da92b6af4a0e23e08b4 | |
parent | 4eba212e11e9ae81f90ea5fad68efa0a96025020 (diff) | |
download | iurt-098dd6589b485ea0b6fe329b9b802a30d866cc0e.tar iurt-098dd6589b485ea0b6fe329b9b802a30d866cc0e.tar.gz iurt-098dd6589b485ea0b6fe329b9b802a30d866cc0e.tar.bz2 iurt-098dd6589b485ea0b6fe329b9b802a30d866cc0e.tar.xz iurt-098dd6589b485ea0b6fe329b9b802a30d866cc0e.zip |
- support passing the place of iurt logs to the command, so the iurt2.sh
wrapper can save iurt output there
- revert a change from r258923: don't try using tee in the SSH command, the
single quotes break the command line, probably due to them already being
used somewhere else
-rwxr-xr-x | ulri | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -663,6 +663,7 @@ 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}) { @@ -674,7 +675,7 @@ foreach my $prefix (sort keys %pkg_tree) { $cmd =~ s!__MEDIA__!$media_to_add!g; plog('DEBUG', "Build $pkgs"); - ssh($remote, "'$cmd $pkgs | tee $prefix_dir/log/botcmd.log' > $temp &"); + ssh($remote, "$cmd $pkgs > $temp &"); # wait 10 seconds or until we have the log file # plus 20 seconds if it timeouts. |