From 2125967ff6a62e1c60395aa14144e6357287e6ec Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Tue, 1 Aug 2006 13:21:29 +0000 Subject: strict-arch doesn't apply to src packages --- URPM/Resolve.pm | 4 ++-- 1 file 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; -- cgit v1.2.1