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 | 7a71894c93f0cee8f9aa5e83a205f1a46848ef6d (patch) | |
| tree | cea5de563cb65781b5635345d3ecaf1b244ed990 /perl-install/install/steps.pm | |
| parent | 679c36da30fb6f58eacf8a80265f432664812e89 (diff) | |
| download | drakx-backup-do-not-use-7a71894c93f0cee8f9aa5e83a205f1a46848ef6d.tar drakx-backup-do-not-use-7a71894c93f0cee8f9aa5e83a205f1a46848ef6d.tar.gz drakx-backup-do-not-use-7a71894c93f0cee8f9aa5e83a205f1a46848ef6d.tar.bz2 drakx-backup-do-not-use-7a71894c93f0cee8f9aa5e83a205f1a46848ef6d.tar.xz drakx-backup-do-not-use-7a71894c93f0cee8f9aa5e83a205f1a46848ef6d.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/steps.pm')
| -rw-r--r-- | perl-install/install/steps.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |