From b494812daced7acbb49aaf27671cde8a4f055b7e Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 27 Oct 2008 11:38:11 +0000 Subject: simplify: instead of passing around {rpmdb}, set $urpm->{env_rpmdb} and use it --- urpm/select.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'urpm/select.pm') diff --git a/urpm/select.pm b/urpm/select.pm index c780b932..f816bbb7 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -229,7 +229,6 @@ sub _search_packages_keep_best { #- The return value is true if program should be restarted (in order to take #- care of important packages being upgraded (priority upgrades) #- %options : -#- rpmdb #- auto_select #- install_src #- priority_upgrade @@ -248,7 +247,7 @@ sub resolve_dependencies { require urpm::parallel; #- help perl_checker; urpm::parallel::resolve_dependencies($urpm, $state, $requested, %options); } else { - my $db = urpm::db_open_or_die__($urpm, $options{rpmdb}); + my $db = urpm::db_open_or_die_($urpm); my $sig_handler = sub { undef $db; exit 3 }; local $SIG{INT} = $sig_handler; @@ -261,7 +260,7 @@ sub resolve_dependencies { ); } - if ($options{priority_upgrade} && !$options{rpmdb}) { + if ($options{priority_upgrade} && !$urpm->{env_rpmdb}) { #- first check if a priority_upgrade package is requested #- (it should catch all occurences in --auto-select mode) #- (nb: a package "foo" may appear twice, and only one will be set flag_upgrade) -- cgit v1.2.1