From b2d42984a48190b7eeba990096a302d2ce8f263d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 10 Jul 2008 12:05:46 +0000 Subject: - merge diffs with parallel_ssh - fix return value (bug introduced during refactoring) --- urpm/parallel_ka_run.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'urpm') diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index a933d90e..58ec5798 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -74,15 +74,16 @@ sub _run_mput { sub parallel_install { my ($parallel, $urpm, undef, $install, $upgrade, %options) = @_; - copy_to_dir($parallel, $urpm, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms/"); + copy_to_dir($parallel, $urpm, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms"); - my (%bad_nodes); + my %bad_nodes; $parallel->urpm_popen($urpm, 'urpmi', "--pre-clean --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}", sub { my ($node, $s) = @_; $s =~ /^\s*$/ and return; $bad_nodes{$node} .= $s; $s =~ /Installation failed/ and $bad_nodes{$node} = ''; $s =~ /Installation is possible/ and delete $bad_nodes{$node}; + undef; }); foreach (keys %{$parallel->{nodes}}) { -- cgit v1.2.1