summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj')
-rw-r--r--zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj32
1 files changed, 32 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj
new file mode 100644
index 000000000..65f0064fc
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj
@@ -0,0 +1,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) = @_;
+ \ No newline at end of file