aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-01-19 07:58:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-01-19 07:58:09 +0000
commit4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838 (patch)
tree0f8f00c5d0f077cf01d4c9cf7de7e7851aed7829
parent82c0cacde02210978b4e844259c54b46094f3cbb (diff)
downloadperl-URPM-4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838.tar
perl-URPM-4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838.tar.gz
perl-URPM-4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838.tar.bz2
perl-URPM-4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838.tar.xz
perl-URPM-4e8e6bdb8ae85e7c5607c22f8b18b0edd6a4b838.zip
fix regexp detecting the need for strict-arch (on x86_64)
-rw-r--r--URPM/Resolve.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index a5216fb..5190ad3 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -59,7 +59,7 @@ sub find_chosen_packages {
my ($urpm, $db, $state, $dep) = @_;
my %packages;
my %installed_arch;
- my $strict_arch = defined $urpm->{options}{'strict-arch'} ? $urpm->{options}{'strict-arch'} : $Config{archname} =~ /a86_64|sparc64|ppc64/;
+ my $strict_arch = defined $urpm->{options}{'strict-arch'} ? $urpm->{options}{'strict-arch'} : $Config{archname} =~ /x86_64|sparc64|ppc64/;
#- search for possible packages, try to be as fast as possible, backtrack can be longer.
foreach (split /\|/, $dep) {
@@ -839,7 +839,7 @@ sub _no_more_recent_installed_and_providing {
my ($p) = @_;
#- allow if a less recent package is installed,
if ($allow && $pkg->compare_pkg($p) <= 0) {
- if ($p->provides_overlap($required)) {
+ if ($required =~ /^\d+/ || $p->provides_overlap($required)) {
$urpm->{debug_URPM}("not selecting " . $pkg->fullname . " since the more recent " . $p->fullname . " is installed") if $urpm->{debug_URPM};
$allow = 0;
} else {