diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj new file mode 100644 index 000000000..fb00e5493 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20110915/e36848de/attachment-0004.obj @@ -0,0 +1,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;
\ No newline at end of file |