aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-08-01 13:21:29 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-08-01 13:21:29 +0000
commit2125967ff6a62e1c60395aa14144e6357287e6ec (patch)
tree8783d6dfdefbef490a15775ea66d4a186da0c62c /URPM
parentd813dd45bfa01b96f20099d9dea8bb6de3ff5dca (diff)
downloadperl-URPM-2125967ff6a62e1c60395aa14144e6357287e6ec.tar
perl-URPM-2125967ff6a62e1c60395aa14144e6357287e6ec.tar.gz
perl-URPM-2125967ff6a62e1c60395aa14144e6357287e6ec.tar.bz2
perl-URPM-2125967ff6a62e1c60395aa14144e6357287e6ec.tar.xz
perl-URPM-2125967ff6a62e1c60395aa14144e6357287e6ec.zip
strict-arch doesn't apply to src packages
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 1bb8435..886872e 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -68,7 +68,7 @@ sub find_chosen_packages {
$pkg->flag_skip || $state->{rejected}{$pkg->fullname} and next;
#- determine if this package is better than a possibly previously chosen package.
$pkg->flag_selected || exists $state->{selected}{$pkg->id} and return $pkg;
- if ($strict_arch) {
+ if ($strict_arch && $pkg->arch ne 'src') {
my $n = $pkg->name;
defined $installed_arch{$n} or $installed_arch{$n} = get_installed_arch($db, $n);
$installed_arch{$n} && $pkg->arch ne $installed_arch{$n} and next;
@@ -88,7 +88,7 @@ sub find_chosen_packages {
if (!$urpm->{provides}{$name}{$_} || $pkg->provides_overlap($property)) {
#- determine if this package is better than a possibly previously chosen package.
$pkg->flag_selected || exists $state->{selected}{$pkg->id} and return $pkg;
- if ($strict_arch) {
+ if ($strict_arch && $pkg->arch ne 'src') {
my $n = $pkg->name;
defined $installed_arch{$n} or $installed_arch{$n} = get_installed_arch($db, $n);
$installed_arch{$n} && $pkg->arch ne $installed_arch{$n} and next;