aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-08-05 12:56:48 +0000
committerThierry Vignaud <tv@mandriva.org>2009-08-05 12:56:48 +0000
commit511d8c7e5f5298458e6edb8a23511400cc845c93 (patch)
treed54e284cecf1db580c09f12a07cd9937ff75f6f4
parent89efd7fb813ccf7f0647c1c04c32ea638ba0c84e (diff)
downloadrpmdrake-511d8c7e5f5298458e6edb8a23511400cc845c93.tar
rpmdrake-511d8c7e5f5298458e6edb8a23511400cc845c93.tar.gz
rpmdrake-511d8c7e5f5298458e6edb8a23511400cc845c93.tar.bz2
rpmdrake-511d8c7e5f5298458e6edb8a23511400cc845c93.tar.xz
rpmdrake-511d8c7e5f5298458e6edb8a23511400cc845c93.zip
(already_installed_or_not_installable) do not show empty dialogs
(backported from TRUNK) (#47751) rationale: due to some bugs in urpmi, we cannot always keep the state and thus urpm::select::translate_already_installed() results in us displaying empty dialogs sometimes
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bd5a9dc6..324b3721 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not show empty dialogs when uninstalling packages (#47751)
+
Version 5.0.8 - 20 March 2009, Thierry Vignaud
- fix crashing on uninstalling packages (#47751)
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index d8f05edb..1621e74e 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -833,7 +833,9 @@ you may now inspect some in order to take actions:"),
},
already_installed_or_not_installable => sub {
my ($msg1, $msg2) = @_;
- interactive_msg(N("Error"), join("\n", @$msg1, @$msg2));
+ my $msg = join("\n", @$msg1, @$msg2);
+ return if !$msg; # workaround missing state
+ interactive_msg(N("Error"), $msg);
},
},
);