diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-09-17 09:22:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-09-17 09:22:10 +0000 |
| commit | 5d5613ec8eb916fcca3f212dc21726b3192170cd (patch) | |
| tree | cea5de563cb65781b5635345d3ecaf1b244ed990 /perl-install/install | |
| parent | 7b15e9450e5b28ec6dcbe6b875e0d2d44db90586 (diff) | |
| download | drakx-5d5613ec8eb916fcca3f212dc21726b3192170cd.tar drakx-5d5613ec8eb916fcca3f212dc21726b3192170cd.tar.gz drakx-5d5613ec8eb916fcca3f212dc21726b3192170cd.tar.bz2 drakx-5d5613ec8eb916fcca3f212dc21726b3192170cd.tar.xz drakx-5d5613ec8eb916fcca3f212dc21726b3192170cd.zip | |
(beforeInstallPackages) always live patch URPM to favor packages
with mga extension when upgrading
(move the call to live_patch_URPM() from upgrading_redhat() here)
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 3 |
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(); } |