aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-25 14:37:09 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-25 14:37:09 +0000
commit184b1da0039048f6ee2ad69eb06f0fe9a6db711a (patch)
tree61a6cd2a7b5dd32ad911219caa4e4fbca33bb658
parentf89e8b74c038cb652634805252301455c1c5f69a (diff)
downloadrpmdrake-184b1da0039048f6ee2ad69eb06f0fe9a6db711a.tar
rpmdrake-184b1da0039048f6ee2ad69eb06f0fe9a6db711a.tar.gz
rpmdrake-184b1da0039048f6ee2ad69eb06f0fe9a6db711a.tar.bz2
rpmdrake-184b1da0039048f6ee2ad69eb06f0fe9a6db711a.tar.xz
rpmdrake-184b1da0039048f6ee2ad69eb06f0fe9a6db711a.zip
ensure we always restart if needed
-rw-r--r--NEWS1
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3f645db7..910b1ade 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- ensure we always restart if needed
- fix displaying garbaged UTF-8 descriptions (eg: cgoban1)
(instead of displaying "none")
- workaround crashing while performing medium name lookup (#38793)
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index c52e4d9c..443e166a 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -610,7 +610,7 @@ 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(
+ $need_restart ||= urpm::select::resolve_dependencies(
$urpm, $state, $requested,
callback_choices => \&Rpmdrake::gui::callback_choices,
priority_upgrade => $urpm->{options}{'priority-upgrade'},