summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj
blob: fb00e5493e9164ac33ad31a2a245b8c52cf7f466 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
(upgrading_redhat) only favor mga, we don't have packages with mdv or mnb in release tag

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5bb9499..b46ec1d 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;