From c9b2a83020d8428cd84cc54db84eb45959bc9172 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 3 Mar 2008 18:41:52 +0000
Subject: - adapt code to upgrade from redhat for mdv extensions (& for Manbo  
 Core by the way)

---
 perl-install/install/NEWS     |  2 ++
 perl-install/install/steps.pm | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 152a07d07..cec1455b5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
 - auto allocate: do not create /home if drive is smaller than 7GB
+- adapt code to upgrade from redhat for mdv extensions (& for Manbo
+  Core by the way)
 
 Version 10.6.25 - 28 February 2008
 
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 4927d3c2c..6eee0a30b 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -287,7 +287,7 @@ sub upgrading_redhat() {
     unlink "$::prefix/etc/X11/XF86Config";
     unlink "$::prefix/etc/X11/XF86Config-4";
 
-    sub prefering_mdk {
+    sub prefering_mdv {
 	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"));
@@ -297,9 +297,9 @@ sub upgrading_redhat() {
     undef *URPM::Package::compare_pkg;
     *URPM::Package::compare_pkg = sub {
 	my ($lpkg, $rpkg) = @_;
-	my $c = ($lpkg->release =~ /mdk$/ ? 1 : 0) - ($rpkg->release =~ /mdk$/ ? 1 : 0);
+	my $c = ($lpkg->release =~ /mdv|mnb/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb/ ? 1 : 0);
 	if ($c) {
-	    prefering_mdk($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
 	    $c;
 	} else {
 	    &$old_compare_pkg;
@@ -310,9 +310,9 @@ sub upgrading_redhat() {
     undef *URPM::Package::compare;
     *URPM::Package::compare = sub {
 	my ($lpkg, $rpkg_ver) = @_;
-	my $c = ($lpkg->release =~ /mdk$/ ? 1 : 0) - ($rpkg_ver =~ /mdk$/ ? 1 : 0);
+	my $c = ($lpkg->release =~ /mdv|mnb/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb/ ? 1 : 0);
 	if ($c) {
-	    prefering_mdk($lpkg, $rpkg_ver, $c);
+	    prefering_mdv($lpkg, $rpkg_ver, $c);
 	    return $c;
 	}
 	&$old_compare;
-- 
cgit v1.2.1