From 098dd6589b485ea0b6fe329b9b802a30d866cc0e Mon Sep 17 00:00:00 2001 From: Gustavo De Nardin Date: Thu, 6 Aug 2009 06:57:53 +0000 Subject: - 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 --- ulri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ulri') diff --git a/ulri b/ulri index bbf2124..8c06126 100755 --- a/ulri +++ b/ulri @@ -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. -- cgit v1.2.1