From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Sun, 14 Apr 2013 13:46:12 +0000
Subject: Add zarb MLs html archives

---
 .../20110915/e36848de/attachment-0001.obj          | 21 ++++++++++++++
 .../20110915/e36848de/attachment-0002.obj          | 21 ++++++++++++++
 .../20110915/e36848de/attachment-0003.obj          | 14 +++++++++
 .../20110915/e36848de/attachment-0004.obj          | 24 ++++++++++++++++
 .../20110915/e36848de/attachment-0005.obj          | 33 ++++++++++++++++++++++
 .../20110915/e36848de/attachment-0006.obj          | 32 +++++++++++++++++++++
 .../20110915/e36848de/attachment-0007.obj          | 26 +++++++++++++++++
 .../20110915/e36848de/attachment-0008.obj          | 22 +++++++++++++++
 .../20110915/e36848de/attachment-0009.obj          | 21 ++++++++++++++
 .../20110915/e36848de/attachment-0010.obj          | 21 ++++++++++++++
 .../20110915/e36848de/attachment-0011.obj          | 14 +++++++++
 .../20110915/e36848de/attachment-0012.obj          | 24 ++++++++++++++++
 .../20110915/e36848de/attachment-0013.obj          | 33 ++++++++++++++++++++++
 .../20110915/e36848de/attachment-0014.obj          | 32 +++++++++++++++++++++
 .../20110915/e36848de/attachment-0015.obj          | 26 +++++++++++++++++
 .../attachments/20110915/e36848de/attachment.obj   | 22 +++++++++++++++
 16 files changed, 386 insertions(+)
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0001.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0002.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0003.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0005.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0006.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0007.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0008.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0009.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0010.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0011.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0012.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0014.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0015.obj
 create mode 100644 zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment.obj

(limited to 'zarb-ml/mageia-dev/attachments/20110915/e36848de')

diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0001.obj
new file mode 100644
index 000000000..7845b5ea2
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0001.obj
@@ -0,0 +1,21 @@
+(grep_regular_media) factorize a grep for next commit
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -125,10 +125,14 @@
+     return $res;
+ }
+ 
++sub grep_regular_media {
++    my ($urpm) = @_;
++    grep { $_->{name} !~ /debug|sources/i } @{$urpm->{media}};
++}
++
+ sub get_backport_media {
+     my ($urpm) = @_;
+-    grep { $_->{name} =~ /backport/i && 
+-	       $_->{name} !~ /debug|sources/i } @{$urpm->{media}};
++    grep { $_->{name} =~ /backport/i } grep_regular_media($urpm);
+ }
+ 
+ sub get_inactive_backport_media {
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0002.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0002.obj
new file mode 100644
index 000000000..fedcc13d7
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0002.obj
@@ -0,0 +1,21 @@
+(get_release_media,get_active_release_media) enable to list enabled */release media
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -136,6 +140,16 @@
+     map { $_->{name} } grep { $_->{ignore} } get_backport_media($urpm);
+ }
+ 
++sub get_release_media {
++    my ($urpm) = @_;
++    grep { $_->{name} =~ /release/i } grep_regular_media($urpm);
++}
++
++sub get_active_release_media {
++    my ($urpm) = @_;
++    map { $_->{name} } grep { !$_->{ignore} } get_backport_media($urpm);
++}
++
+ sub get_update_medias {
+     my ($urpm) = @_;
+     if (is_it_a_devel_distro()) {
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0003.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0003.obj
new file mode 100644
index 000000000..3c2667004
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0003.obj
@@ -0,0 +1,14 @@
+(open_urpmi_db) when computing updates, look at enabled */release media for requires
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -150,7 +164,7 @@
+     my $urpm = fast_open_urpmi_db();
+     my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
+ 
+-    my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm));
++    my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm), get_active_release_media($urpm));
+     $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}) if !$::env;
+     my $previous = $::rpmdrake_options{'previous-priority-upgrade'};
+     urpm::select::set_priority_upgrade_option($urpm, (ref $previous ? join(',', @$previous) : ()));
+
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj
new file mode 100644
index 000000000..fb00e5493
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj
@@ -0,0 +1,24 @@
+(upgrading_redhat) only favor mga, we don't have packages with mdv or mnb in release tag
+
+diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
+index 5bb9499..b46ec1d 100644
+--- a/perl-install/install/steps.pm
++++ b/perl-install/install/steps.pm
+@@ -292,7 +292,7 @@ sub upgrading_redhat() {
+     undef *URPM::Package::compare_pkg;
+     *URPM::Package::compare_pkg = sub {
+ 	my ($lpkg, $rpkg) = @_;
+-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb|mga/ ? 1 : 0);
++	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg->release =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+ 	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+ 	    $c;
+@@ -305,7 +305,7 @@ sub upgrading_redhat() {
+     undef *URPM::Package::compare;
+     *URPM::Package::compare = sub {
+ 	my ($lpkg, $rpkg_ver) = @_;
+-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb|mga/ ? 1 : 0);
++	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg_ver =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+ 	    prefering_mdv($lpkg, $rpkg_ver, $c);
+ 	    return $c;
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0005.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0005.obj
new file mode 100644
index 000000000..98d4ec939
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0005.obj
@@ -0,0 +1,33 @@
+(prefering_mdv) renamed as prefering_mga()
+
+diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
+index b46ec1d..15d8d43 100644
+--- a/perl-install/install/steps.pm
++++ b/perl-install/install/steps.pm
+@@ -282,7 +282,7 @@ sub upgrading_redhat() {
+     unlink "$::prefix/etc/X11/XF86Config";
+     unlink "$::prefix/etc/X11/XF86Config-4";
+ 
+-    sub prefering_mdv {
++    sub prefering_mga {
+ 	my ($lpkg, $rpkg_ver, $c) = @_;
+ 	my $lpkg_ver = $lpkg->version . '-' . $lpkg->release;
+ 	log::l($lpkg->name . ' ' . ': prefering ' . ($c == 1 ? "$lpkg_ver over $rpkg_ver" : "$rpkg_ver over $lpkg_ver"));
+@@ -294,7 +294,7 @@ sub upgrading_redhat() {
+ 	my ($lpkg, $rpkg) = @_;
+ 	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg->release =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+-	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
++	    prefering_mga($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+ 	    $c;
+ 	} else {
+ 	    &$old_compare_pkg;
+@@ -307,7 +307,7 @@ sub upgrading_redhat() {
+ 	my ($lpkg, $rpkg_ver) = @_;
+ 	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg_ver =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+-	    prefering_mdv($lpkg, $rpkg_ver, $c);
++	    prefering_mga($lpkg, $rpkg_ver, $c);
+ 	    return $c;
+ 	}
+ 	&$old_compare;
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0006.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0006.obj
new file mode 100644
index 000000000..65f0064fc
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0006.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
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
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0008.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0008.obj
new file mode 100644
index 000000000..0659c7ccb
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0008.obj
@@ -0,0 +1,22 @@
+(fast_open_urpmi_db,is_it_a_devel_distro) perl_checker cleanups
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -81,7 +81,7 @@
+     urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}[0]) if $::rpmdrake_options{'urpmi-root'}[0];
+     $::rpmdrake_options{'rpm-root'}[0] ||= $::rpmdrake_options{'urpmi-root'}[0];
+     urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}[0]) if $::rpmdrake_options{'rpm-root'}[0];
+-    urpm::args::set_debug($urpm) if $::rpmdrake_options{'debug'};
++    urpm::args::set_debug($urpm) if $::rpmdrake_options{debug};
+     $urpm->get_global_options;
+     my $error_happened;
+     $urpm->{options}{wait_lock} = $::rpmdrake_options{'wait-lock'};
+@@ -116,7 +116,7 @@
+     $urpm;
+ }
+ 
+-sub is_it_a_devel_distro {
++sub is_it_a_devel_distro() {
+     state $res;
+     return $res if defined $res;
+     
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0009.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0009.obj
new file mode 100644
index 000000000..7845b5ea2
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0009.obj
@@ -0,0 +1,21 @@
+(grep_regular_media) factorize a grep for next commit
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -125,10 +125,14 @@
+     return $res;
+ }
+ 
++sub grep_regular_media {
++    my ($urpm) = @_;
++    grep { $_->{name} !~ /debug|sources/i } @{$urpm->{media}};
++}
++
+ sub get_backport_media {
+     my ($urpm) = @_;
+-    grep { $_->{name} =~ /backport/i && 
+-	       $_->{name} !~ /debug|sources/i } @{$urpm->{media}};
++    grep { $_->{name} =~ /backport/i } grep_regular_media($urpm);
+ }
+ 
+ sub get_inactive_backport_media {
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0010.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0010.obj
new file mode 100644
index 000000000..fedcc13d7
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0010.obj
@@ -0,0 +1,21 @@
+(get_release_media,get_active_release_media) enable to list enabled */release media
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -136,6 +140,16 @@
+     map { $_->{name} } grep { $_->{ignore} } get_backport_media($urpm);
+ }
+ 
++sub get_release_media {
++    my ($urpm) = @_;
++    grep { $_->{name} =~ /release/i } grep_regular_media($urpm);
++}
++
++sub get_active_release_media {
++    my ($urpm) = @_;
++    map { $_->{name} } grep { !$_->{ignore} } get_backport_media($urpm);
++}
++
+ sub get_update_medias {
+     my ($urpm) = @_;
+     if (is_it_a_devel_distro()) {
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0011.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0011.obj
new file mode 100644
index 000000000..3c2667004
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0011.obj
@@ -0,0 +1,14 @@
+(open_urpmi_db) when computing updates, look at enabled */release media for requires
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -150,7 +164,7 @@
+     my $urpm = fast_open_urpmi_db();
+     my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
+ 
+-    my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm));
++    my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm), get_active_release_media($urpm));
+     $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}) if !$::env;
+     my $previous = $::rpmdrake_options{'previous-priority-upgrade'};
+     urpm::select::set_priority_upgrade_option($urpm, (ref $previous ? join(',', @$previous) : ()));
+
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0012.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0012.obj
new file mode 100644
index 000000000..fb00e5493
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0012.obj
@@ -0,0 +1,24 @@
+(upgrading_redhat) only favor mga, we don't have packages with mdv or mnb in release tag
+
+diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
+index 5bb9499..b46ec1d 100644
+--- a/perl-install/install/steps.pm
++++ b/perl-install/install/steps.pm
+@@ -292,7 +292,7 @@ sub upgrading_redhat() {
+     undef *URPM::Package::compare_pkg;
+     *URPM::Package::compare_pkg = sub {
+ 	my ($lpkg, $rpkg) = @_;
+-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb|mga/ ? 1 : 0);
++	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg->release =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+ 	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+ 	    $c;
+@@ -305,7 +305,7 @@ sub upgrading_redhat() {
+     undef *URPM::Package::compare;
+     *URPM::Package::compare = sub {
+ 	my ($lpkg, $rpkg_ver) = @_;
+-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb|mga/ ? 1 : 0);
++	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg_ver =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+ 	    prefering_mdv($lpkg, $rpkg_ver, $c);
+ 	    return $c;
\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj
new file mode 100644
index 000000000..98d4ec939
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj
@@ -0,0 +1,33 @@
+(prefering_mdv) renamed as prefering_mga()
+
+diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
+index b46ec1d..15d8d43 100644
+--- a/perl-install/install/steps.pm
++++ b/perl-install/install/steps.pm
+@@ -282,7 +282,7 @@ sub upgrading_redhat() {
+     unlink "$::prefix/etc/X11/XF86Config";
+     unlink "$::prefix/etc/X11/XF86Config-4";
+ 
+-    sub prefering_mdv {
++    sub prefering_mga {
+ 	my ($lpkg, $rpkg_ver, $c) = @_;
+ 	my $lpkg_ver = $lpkg->version . '-' . $lpkg->release;
+ 	log::l($lpkg->name . ' ' . ': prefering ' . ($c == 1 ? "$lpkg_ver over $rpkg_ver" : "$rpkg_ver over $lpkg_ver"));
+@@ -294,7 +294,7 @@ sub upgrading_redhat() {
+ 	my ($lpkg, $rpkg) = @_;
+ 	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg->release =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+-	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
++	    prefering_mga($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+ 	    $c;
+ 	} else {
+ 	    &$old_compare_pkg;
+@@ -307,7 +307,7 @@ sub upgrading_redhat() {
+ 	my ($lpkg, $rpkg_ver) = @_;
+ 	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg_ver =~ /mga/ ? 1 : 0);
+ 	if ($c) {
+-	    prefering_mdv($lpkg, $rpkg_ver, $c);
++	    prefering_mga($lpkg, $rpkg_ver, $c);
+ 	    return $c;
+ 	}
+ 	&$old_compare;
\ No newline at end of file
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
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
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment.obj
new file mode 100644
index 000000000..0659c7ccb
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment.obj
@@ -0,0 +1,22 @@
+(fast_open_urpmi_db,is_it_a_devel_distro) perl_checker cleanups
+
+--- /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm.tv8	2011-09-15 13:21:31.996304467 +0000
++++ /usr/lib/perl5/vendor_perl/5.12.3/Rpmdrake/open_db.pm	2011-09-15 13:24:12.932431234 +0000
+@@ -81,7 +81,7 @@
+     urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}[0]) if $::rpmdrake_options{'urpmi-root'}[0];
+     $::rpmdrake_options{'rpm-root'}[0] ||= $::rpmdrake_options{'urpmi-root'}[0];
+     urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}[0]) if $::rpmdrake_options{'rpm-root'}[0];
+-    urpm::args::set_debug($urpm) if $::rpmdrake_options{'debug'};
++    urpm::args::set_debug($urpm) if $::rpmdrake_options{debug};
+     $urpm->get_global_options;
+     my $error_happened;
+     $urpm->{options}{wait_lock} = $::rpmdrake_options{'wait-lock'};
+@@ -116,7 +116,7 @@
+     $urpm;
+ }
+ 
+-sub is_it_a_devel_distro {
++sub is_it_a_devel_distro() {
+     state $res;
+     return $res if defined $res;
+     
\ No newline at end of file
-- 
cgit v1.2.1