diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
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.obj | 32 |
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 |