diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-03-31 15:47:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-03-31 15:47:42 +0000 |
| commit | a5ad189eb954bb476339ba0a42504831305f7c8e (patch) | |
| tree | bcdae95b84e027f5c7e45fd84be36f3fa405de5e | |
| parent | a2ae5ab4e0715f0c89229800cc44b5b5ce051509 (diff) | |
| download | rpmdrake-a5ad189eb954bb476339ba0a42504831305f7c8e.tar rpmdrake-a5ad189eb954bb476339ba0a42504831305f7c8e.tar.gz rpmdrake-a5ad189eb954bb476339ba0a42504831305f7c8e.tar.bz2 rpmdrake-a5ad189eb954bb476339ba0a42504831305f7c8e.tar.xz rpmdrake-a5ad189eb954bb476339ba0a42504831305f7c8e.zip | |
(perform_installation) fix priority upgrades by not recomputing them
when checking selection consistency just before actually installing
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -4,6 +4,8 @@ (eg: after old buggy gurpmi.addmedia garbaged it) (#39511) o fix priority upgrades: * do not preselect updates + * do not recompute them when checking selection consistency just + before actually installing Version 4.9.9 - 28 March 2008, Thierry Vignaud diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 0ef07ed7..8c659410 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -613,10 +613,9 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( # select packages to install / enssure selected pkg set is consistant: my $requested = { map { $_->id => undef } grep { $_->flag_selected } @{$urpm->{depslist}} }; - $need_restart ||= urpm::select::resolve_dependencies( + urpm::select::resolve_dependencies( $urpm, $state, $requested, callback_choices => \&Rpmdrake::gui::callback_choices, - priority_upgrade => $urpm->{options}{'priority-upgrade'}, ); statusbar_msg_remove($bar_id); |