blob: 65f0064fc075a5778e307a5bcb98972b3d13c980 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
(live_patch_URPM) split it out of upgrading_redhat()
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 15d8d43..81daf68 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) = @_;
|