revert what tv added, will give rpmdrake a special function for its needs

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