summaryrefslogtreecommitdiffstats
path: root/perl-install
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 /perl-install
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)
Diffstat (limited to 'perl-install')
-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);
}
drakx/commit/perl-install/share?id=52220888101de9734ce3092f3fb6776c0a5c486a'>fix discovery-icons-theme positionFlorent Villard2005-09-201-1/+1 | * fix discovery-icons-theme positionFlorent Villard2005-09-201-1/+2 | * updatesKeld Simonsen2005-09-201-141/+74 | | | | | soft/menu-messages/main/da.po gi/perl-install/share/po/da.po * fix discovery-icons-theme duplicatedFlorent Villard2005-09-201-2/+1 | * add various packs customizationFlorent Villard2005-09-201-0/+5 | * Updated sl translations.Funda Wang2005-09-201-129/+60 | * UpdatedWilly Sudiarto Raharjo2005-09-201-2/+2 | * * Sep 20 2005 Reinout van Schouwen <reinout@cs.vu.nl>Reinout van Schouwen2005-09-191-2/+15 | | | | | Last few strings in Dutch translation * jorgeJosé Jorge2005-09-191-184/+84 | * *** empty log message ***Arpad Biro2005-09-191-170/+77 | * updateThierry Vignaud2005-09-191-13/+13 | * fixes from marketing.Frederic Lepied2005-09-191-8/+8 | * updateThierry Vignaud2005-09-191-5/+5 | * Filled one more msg.Wanderlei Antonio Cavassin2005-09-191-1/+1 | * translate new adThierry Vignaud2005-09-191-2/+2 | * Updated Estonian translation.Marek Laane2005-09-191-3/+3 | * Updated POT fileFunda Wang2005-09-1970-49619/+50190 | * Updated POT file.Funda Wang2005-09-191-563/+546 | * fix skype and add intelFlorent Villard2005-09-191-1/+2 | * add intel adFlorent Villard2005-09-192-0/+3 | * add skype addFlorent Villard2005-09-191-0/+1 | * fix acroread rpmsrate completionFlorent Villard2005-09-191-1/+2 | * Updated Malay translationSharuzzaman Ahmat Raslan2005-09-191-3/+2 | * Updated Malay translationSharuzzaman Ahmat Raslan2005-09-191-2345/+2744 | * Updated Czech translations.Michal Bukovjan2005-09-181-164/+75 | * updated slovak translationTibor Pittich2005-09-181-4170/+3344 | * typo fixThierry Vignaud2005-09-1871-71/+71 | * Updated translations, fully translated, was 60 fuzzy, 147 untranslated.Thomas Backlund2005-09-181-258/+315 | * * Sep 18 2005 Reinout van Schouwen <reinout@cs.vu.nl>Reinout van Schouwen2005-09-181-68/+83 | | | | | Updated Dutch translation * typo fixThierry Vignaud2005-09-18