summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7f18c7890..e28711041 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- only favor packages with mga extension, we don't have packages with mdv or
mnb in release tag
+- always favor packages with 'mga' extension when upgrading anything else
+ than Mageia
Version 13.64 - 08 September 2011
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 81daf684f..f3240122e 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -315,7 +315,6 @@ sub upgrading_redhat() {
#- remove weird config files that bother Xconfig::* too much
unlink "$::prefix/etc/X11/XF86Config";
unlink "$::prefix/etc/X11/XF86Config-4";
- live_patch_URPM();
}
sub beforeInstallPackages {
@@ -349,6 +348,8 @@ sub beforeInstallPackages {
);
rm_rf(@to_remove);
+ live_patch_URPM() if $o->{isUpgrade} !~ /mageia/;
+
if ($o->{isUpgrade} eq 'redhat') {
upgrading_redhat();
}