diff options
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0013.obj | 33 |
1 files changed, 33 insertions, 0 deletions
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 |