summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-06 19:09:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-06 19:09:16 +0000
commitc45cf0d96bb16d252285dcace2f5a70977e5748b (patch)
tree0ecdf75e9feabf7c3db6c397c727d3417ff799b7
parentc6041c923732bc47f500c63fda1c5049f366f073 (diff)
downloadurpmi-c45cf0d96bb16d252285dcace2f5a70977e5748b.tar
urpmi-c45cf0d96bb16d252285dcace2f5a70977e5748b.tar.gz
urpmi-c45cf0d96bb16d252285dcace2f5a70977e5748b.tar.bz2
urpmi-c45cf0d96bb16d252285dcace2f5a70977e5748b.tar.xz
urpmi-c45cf0d96bb16d252285dcace2f5a70977e5748b.zip
revert what tv added, will give rpmdrake a special function for its needs
-rw-r--r--urpm/select.pm9
1 files changed, 2 insertions, 7 deletions
diff --git a/urpm/select.pm b/urpm/select.pm
index a0757095..9582256e 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -226,10 +226,7 @@ sub _search_packages {
#- rpmdb
#- auto_select
#- install_src
-#- only_request_packages_to_upgrade (rpmdrake doesn't want to actually select them)
#- priority_upgrade
-#- upgrade_callback
-#- resolve_req_callback
#- %options passed to ->resolve_requested:
#- callback_choices
#- keep
@@ -263,7 +260,6 @@ sub resolve_dependencies {
$urpm->request_packages_to_upgrade($db, $state, $requested, requested => undef,
$urpm->{searchmedia} ? (idlist => searchmedia_idlist($urpm)) : (),
);
- $options{upgrade_callback} and $options{upgrade_callback}->();
}
my @priority_upgrade;
@@ -296,9 +292,8 @@ sub resolve_dependencies {
}
}
- if (!$need_restart && !$options{only_request_packages_to_upgrade}) {
- my @requested = $urpm->resolve_requested($db, $state, $requested, %options);
- $options{resolve_req_callback} and $options{resolve_req_callback}->(@requested);
+ if (!$need_restart) {
+ $urpm->resolve_requested($db, $state, $requested, %options);
#- now check if a priority_upgrade package has been required
#- by a requested package