summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-17 09:22:01 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-17 09:22:01 +0000
commit702298dcb2795a45dd13248525c619a0397d79c3 (patch)
tree0890ead72abe1d0cbcb7b8c99a2ab6c3c5c70f5c
parente19f769012afd67e1d97ddaf435ff40c682c0a65 (diff)
downloaddrakx-702298dcb2795a45dd13248525c619a0397d79c3.tar
drakx-702298dcb2795a45dd13248525c619a0397d79c3.tar.gz
drakx-702298dcb2795a45dd13248525c619a0397d79c3.tar.bz2
drakx-702298dcb2795a45dd13248525c619a0397d79c3.tar.xz
drakx-702298dcb2795a45dd13248525c619a0397d79c3.zip
(upgrading_redhat) only favor mga, we don't have packages with mdv or mnb in release tag
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/steps.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9cdf1877f..7f18c7890 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- only favor packages with mga extension, we don't have packages with mdv or
+ mnb in release tag
+
Version 13.64 - 08 September 2011
- install more packages earlier (acpi{,d}, dhcp client, firewall & bootloader
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5bb9499c9..b46ec1d2e 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;