summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-23 17:28:11 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-23 17:28:11 +0000
commitc9d7bd7cb8c8e3da60669c79a456f68c63e67fa7 (patch)
treefc87e0519fa9c5ed13c94f6664caa5a2e3023652
parentd72117e06bf24160ee444cfea2c2a9f3d3db42e5 (diff)
downloaddrakx-c9d7bd7cb8c8e3da60669c79a456f68c63e67fa7.tar
drakx-c9d7bd7cb8c8e3da60669c79a456f68c63e67fa7.tar.gz
drakx-c9d7bd7cb8c8e3da60669c79a456f68c63e67fa7.tar.bz2
drakx-c9d7bd7cb8c8e3da60669c79a456f68c63e67fa7.tar.xz
drakx-c9d7bd7cb8c8e3da60669c79a456f68c63e67fa7.zip
(selectInstallClass) do not offer to upgrade mdv 201[1-9] (mga#5004)
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 92dc7c1f9..3af26f0ec 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- do not offer to upgrade mdv 201[1-9] (mga#5004)
- individual package selection:
o fix a crash
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index db16681fb..46ab17efe 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -130,7 +130,7 @@ sub selectInstallClass {
my @l = install::any::find_root_parts($o->{fstab}, $::prefix);
# Don't list other archs as ugrading between archs is not supported
my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();
- @l = grep { $_->{arch} eq $arch } @l;
+ @l = grep { $_->{arch} eq $arch && $_->{version} !~ /201[1-9]/ } @l;
if (@l) {
_try_to_upgrade($o, @l);
}