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-0007.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-0007.obj')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0007.obj | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0007.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0007.obj new file mode 100644 index 000000000..7dd3ea1b7 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0007.obj @@ -0,0 +1,26 @@ +(beforeInstallPackages) always live patch URPM to favor packages +with mga extension when upgrading + +(move the call to live_patch_URPM() from upgrading_redhat() here) + +diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm +index 81daf68..f324012 100644 +--- a/perl-install/install/steps.pm ++++ b/perl-install/install/steps.pm +@@ -315,7 +315,6 @@ 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 { +@@ -349,6 +348,8 @@ sub beforeInstallPackages { + ); + rm_rf(@to_remove); + ++ live_patch_URPM() if $o->{isUpgrade} !~ /mageia/; ++ + if ($o->{isUpgrade} eq 'redhat') { + upgrading_redhat(); + }
\ No newline at end of file |