summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-17 09:22:07 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-17 09:22:07 +0000
commit7b15e9450e5b28ec6dcbe6b875e0d2d44db90586 (patch)
tree7b9542512399f18f6512dbaca93a057c50cfcd90 /perl-install/install
parentc2b791c15075df63abec1cb0fc1a1b92299bfe77 (diff)
downloaddrakx-7b15e9450e5b28ec6dcbe6b875e0d2d44db90586.tar
drakx-7b15e9450e5b28ec6dcbe6b875e0d2d44db90586.tar.gz
drakx-7b15e9450e5b28ec6dcbe6b875e0d2d44db90586.tar.bz2
drakx-7b15e9450e5b28ec6dcbe6b875e0d2d44db90586.tar.xz
drakx-7b15e9450e5b28ec6dcbe6b875e0d2d44db90586.zip
(live_patch_URPM) split it out of upgrading_redhat()
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/steps.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 15d8d4327..81daf684f 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -277,10 +277,7 @@ sub choosePackages {
$availableCorrected;
}
-sub upgrading_redhat() {
- #- remove weird config files that bother Xconfig::* too much
- unlink "$::prefix/etc/X11/XF86Config";
- unlink "$::prefix/etc/X11/XF86Config-4";
+sub live_patch_URPM() {
sub prefering_mga {
my ($lpkg, $rpkg_ver, $c) = @_;
@@ -314,6 +311,13 @@ sub upgrading_redhat() {
};
}
+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 {
my ($o) = @_;