From c835f00ab6b8041b1acc7292997adb34f24c8a10 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 10 Jul 2008 12:19:39 +0000 Subject: factorize parallel_install() which is now the same in each backend --- urpm/parallel_ka_run.pm | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'urpm/parallel_ka_run.pm') diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 420921f2..9a2db2d6 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -75,39 +75,6 @@ sub _run_mput { $? == 0 || $? == 256 or $urpm->{fatal}(1, N("mput failed, maybe a node is unreacheable")); } -#- parallel install. -sub parallel_install { - my ($parallel, $urpm, undef, $install, $upgrade, %options) = @_; - - copy_to_dir($parallel, $urpm, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms"); - - my (%bad_nodes, @good_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 push @good_nodes, $node; - undef; - }); - delete $bad_nodes{$_} foreach @good_nodes; - - foreach (keys %{$parallel->{nodes}}) { - exists $bad_nodes{$_} or next; - $urpm->{error}(N("Installation failed on node %s", $_) . ":\n" . $bad_nodes{$_}); - } - %bad_nodes and return; - - if ($options{test}) { - $urpm->{error}(N("Installation is possible")); - 1; - } else { - my $line = $parallel->{line} . ($options{excludepath} ? " --excludepath '$options{excludepath}'" : ""); - #- continue installation. - run_urpm_command($parallel, $urpm, 'urpmi', "--no-verify-rpm --auto --synthesis $parallel->{synthesis} $line"); - } -} - sub _parse_rshp_output { my ($s) = @_; #- eg of output of rshp2: [rank:2]:@removing@mpich-1.2.5.2-10mlcs4.x86_64 -- cgit v1.2.1