summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 15:03:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 15:03:15 +0000
commit3036afacd2e78524060d15a759efce21b912c3e1 (patch)
tree75b5783493b1fd14cd947f88586575210853e038
parent3034ae97c467f38171a8e0370a98fa2f4e2cc3e3 (diff)
downloadurpmi-3036afacd2e78524060d15a759efce21b912c3e1.tar
urpmi-3036afacd2e78524060d15a759efce21b912c3e1.tar.gz
urpmi-3036afacd2e78524060d15a759efce21b912c3e1.tar.bz2
urpmi-3036afacd2e78524060d15a759efce21b912c3e1.tar.xz
urpmi-3036afacd2e78524060d15a759efce21b912c3e1.zip
move urpm::parallel_remove to urpm::parallel::remove
(but keep urpm::parallel_remove for backward compatibility since rpmdrake uses it)
-rw-r--r--urpm.pm13
-rw-r--r--urpm/parallel.pm12
-rw-r--r--urpme2
3 files changed, 15 insertions, 12 deletions
diff --git a/urpm.pm b/urpm.pm
index 53692b48..842a7334 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3053,17 +3053,8 @@ sub find_removed_from_basesystem {
return 1;
}
-#- remove packages from node as remembered according to resolving done.
-sub parallel_remove {
- my ($urpm, $remove, %options) = @_;
- my $state = {};
- my $callback = sub { $urpm->{fatal}(1, "internal distributed remove fatal error") };
- $urpm->{parallel_handler}->parallel_find_remove($urpm, $state, $remove, %options,
- callback_notfound => undef,
- callback_fuzzy => $callback,
- callback_base => $callback,
- );
-}
+#- deprecated
+sub parallel_remove { &urpm::parallel::remove }
#- misc functions to help finding ask_unselect and ask_remove elements with their reasons translated.
sub unselected_packages {
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index e5dff4ff..dcc68dce 100644
--- a/urpm/parallel.pm
+++ b/urpm/parallel.pm
@@ -54,4 +54,16 @@ sub resolve_dependencies {
$urpm->{parallel_handler}->parallel_resolve_dependencies($file, $urpm, $state, $requested, %options);
}
+#- remove packages from node as remembered according to resolving done.
+sub remove {
+ my ($urpm, $remove, %options) = @_;
+ my $state = {};
+ my $callback = sub { $urpm->{fatal}(1, "internal distributed remove fatal error") };
+ $urpm->{parallel_handler}->parallel_find_remove($urpm, $state, $remove, %options,
+ callback_notfound => undef,
+ callback_fuzzy => $callback,
+ callback_base => $callback,
+ );
+}
+
1;
diff --git a/urpme b/urpme
index f45fb8e1..be067040 100644
--- a/urpme
+++ b/urpme
@@ -130,7 +130,7 @@ if ($test && $auto) {
#- Warning : the following message is parsed in urpm::parallel_*
print N("removing %s", join(' ', sort @toremove)) . "\n";
@l = $parallel
- ? $urpm->parallel_remove(
+ ? urpm::parallel::remove($urpm,
\@toremove,
test => $test,
force => $force,