1 files changed, 26 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0015.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0015.obj
new file mode 100644
index 000000000..7dd3ea1b7
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0015.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