summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 14:59:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 14:59:23 +0000
commit3034ae97c467f38171a8e0370a98fa2f4e2cc3e3 (patch)
tree895b135cfa8b5a00314219ffc85579f2f32e9cbf
parentd3bf74fd5a3e2ae27c4b1fb407310b0a6d9b242d (diff)
downloadurpmi-3034ae97c467f38171a8e0370a98fa2f4e2cc3e3.tar
urpmi-3034ae97c467f38171a8e0370a98fa2f4e2cc3e3.tar.gz
urpmi-3034ae97c467f38171a8e0370a98fa2f4e2cc3e3.tar.bz2
urpmi-3034ae97c467f38171a8e0370a98fa2f4e2cc3e3.tar.xz
urpmi-3034ae97c467f38171a8e0370a98fa2f4e2cc3e3.zip
drop urpm::parallel_install(), directly use {parallel_handler}->parallel_install
-rw-r--r--urpm.pm7
-rwxr-xr-xurpmi8
2 files changed, 5 insertions, 10 deletions
diff --git a/urpm.pm b/urpm.pm
index 42200a8c..53692b48 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2918,13 +2918,6 @@ sub install {
@l;
}
-#- install all files to node as remembered according to resolving done.
-sub parallel_install {
- my @para = @_;
- my ($urpm, $_remove, $_install, $_upgrade, %_options) = @para;
- $urpm->{parallel_handler}->parallel_install(@para);
-}
-
#- find packages to remove.
#- options:
#- bundle
diff --git a/urpmi b/urpmi
index 4d56fcda..4baeaee3 100755
--- a/urpmi
+++ b/urpmi
@@ -693,9 +693,11 @@ foreach my $set (@{$state->{transaction} || []}) {
print N("distributing %s", join(' ', values %transaction_sources_install, values %transaction_sources)), "\n";
#- no remove are handle here, automatically done by each distant node.
$urpm->{log}("starting distributed install");
- $urpm->parallel_install([ keys %{$state->{rejected} || {}} ], \%transaction_sources_install, \%transaction_sources,
- test => $test,
- excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs});
+ $urpm->{parallel_handler}->parallel_install(
+ [ keys %{$state->{rejected} || {}} ], \%transaction_sources_install, \%transaction_sources,
+ test => $test,
+ excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs},
+ );
} else {
my @packnames = (values %transaction_sources_install, values %transaction_sources);
(my $common_prefix) = $packnames[0] =~ m!^(.*)/!;