From 679c36da30fb6f58eacf8a80265f432664812e89 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 17 Sep 2011 09:22:07 +0000 Subject: (live_patch_URPM) split it out of upgrading_redhat() --- perl-install/install/steps.pm | 12 ++++++++---- 1 file 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) = @_; -- cgit v1.2.1