diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-09-17 09:22:04 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-09-17 09:22:04 +0000 |
| commit | b976d170c3114a8d0f313161a05c0bf20c2152b4 (patch) | |
| tree | 46204e529937344396244811541fe4ea80e85cd7 /perl-install | |
| parent | 20013514b07e7a28c89510e68a15651343320c3e (diff) | |
| download | drakx-backup-do-not-use-b976d170c3114a8d0f313161a05c0bf20c2152b4.tar drakx-backup-do-not-use-b976d170c3114a8d0f313161a05c0bf20c2152b4.tar.gz drakx-backup-do-not-use-b976d170c3114a8d0f313161a05c0bf20c2152b4.tar.bz2 drakx-backup-do-not-use-b976d170c3114a8d0f313161a05c0bf20c2152b4.tar.xz drakx-backup-do-not-use-b976d170c3114a8d0f313161a05c0bf20c2152b4.zip | |
(prefering_mdv) renamed as prefering_mga()
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/steps.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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; |