From c2b791c15075df63abec1cb0fc1a1b92299bfe77 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sat, 17 Sep 2011 09:22:04 +0000
Subject: (prefering_mdv) renamed as prefering_mga()

---
 perl-install/install/steps.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index b46ec1d2e..15d8d4327 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;
-- 
cgit v1.2.1