summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-16 17:55:26 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-16 17:55:26 +0000
commitf5a68b4b22844f2e40b9a22994dcf183265d23b7 (patch)
treea32df5fbd4c4c1d8dede272bce455fbe2819897b
parent89a7896512c618eb8f19610755ab64ff80dd1df6 (diff)
downloaddrakx-f5a68b4b22844f2e40b9a22994dcf183265d23b7.tar
drakx-f5a68b4b22844f2e40b9a22994dcf183265d23b7.tar.gz
drakx-f5a68b4b22844f2e40b9a22994dcf183265d23b7.tar.bz2
drakx-f5a68b4b22844f2e40b9a22994dcf183265d23b7.tar.xz
drakx-f5a68b4b22844f2e40b9a22994dcf183265d23b7.zip
(remove_package_for_upgrade) fix crash
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/any.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c9b5e54c7..b3abe8a5e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix crash
+
Version 11.88 - 16 February 2009
- don't crash on invalid partition table
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 6ad227e20..23bd12df3 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -372,9 +372,9 @@ sub setPackages {
sub remove_package_for_upgrade {
my ($o) = @_;
- my $extension;
+ my $extension = $o->{upgrade_by_removing_pkgs_matching};
- return if !$extension = $o->{upgrade_by_removing_pkgs_matching};
+ return if !$extension;
my $time = time();
my ($_w, $wait_message) = $o->wait_message_with_progress_bar;