From 0404e11b2a788856dc738e310982dca789f79974 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 10 Jul 2008 12:03:41 +0000 Subject: move parallel_resolve_dependencies() which is now the same in parallel_ssh and parallel_ka_run --- urpm/parallel_ka_run.pm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'urpm/parallel_ka_run.pm') diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 2c1ccad7..a933d90e 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -70,36 +70,6 @@ sub _run_mput { $? == 0 || $? == 256 or $urpm->{fatal}(1, N("mput failed, maybe a node is unreacheable")); } -#- parallel resolve_dependencies -sub parallel_resolve_dependencies { - my ($parallel, $synthesis, $urpm, $state, $requested, %options) = @_; - - #- first propagate the synthesis file to all machines - propagate_file($parallel, $urpm, $synthesis); - - $parallel->{synthesis} = $synthesis; - - my $line = urpm::parallel::simple_resolve_dependencies($parallel, $urpm, $state, $requested, %options); - - #- execute urpmq to determine packages to install. - my ($cont, %chosen); - do { - $cont = 0; #- prepare to stop iteration. - #- the following state should be cleaned for each iteration. - delete $state->{selected}; - #- now try an iteration of urpmq. - $parallel->urpm_popen($urpm, 'urpmq', "--synthesis $synthesis -fduc $line " . join(' ', keys %chosen), sub { - my ($node, $s) = @_; - urpm::parallel::parse_urpmq_output($urpm, $state, $node, $s, \$cont, \%chosen, %options); - }); - #- check for internal error of resolution. - $cont == 1 and die "internal distant urpmq error on choice not taken"; - } while $cont; - - #- keep trace of what has been chosen finally (if any). - $parallel->{line} = join(' ', $line, keys %chosen); -} - #- parallel install. sub parallel_install { my ($parallel, $urpm, undef, $install, $upgrade, %options) = @_; -- cgit v1.2.1