summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-20 11:53:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-20 11:53:21 +0000
commitd11c587f3f47e43395d73c1865b29635b40f47f6 (patch)
tree56b01a3382843ca6fc32cd28dffc81c94924999a
parentde308ea3db1cfadbdbfe0361c6ee6c76d398699e (diff)
downloadurpmi-d11c587f3f47e43395d73c1865b29635b40f47f6.tar
urpmi-d11c587f3f47e43395d73c1865b29635b40f47f6.tar.gz
urpmi-d11c587f3f47e43395d73c1865b29635b40f47f6.tar.bz2
urpmi-d11c587f3f47e43395d73c1865b29635b40f47f6.tar.xz
urpmi-d11c587f3f47e43395d73c1865b29635b40f47f6.zip
better prototype for _findindeps()
-rw-r--r--urpm.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 94d1b5f7..7567a116 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2087,17 +2087,17 @@ sub register_rpms {
}
sub _findindeps {
- my ($urpm, $found, $qv, $v, %options) = @_;
+ my ($urpm, $found, $qv, $v, $caseinsensitive, $src) = @_;
foreach (keys %{$urpm->{provides}}) {
#- search through provides to find if a provide matches this one;
#- but manage choices correctly (as a provides may be virtual or
#- defined several times).
- /$qv/ || !$options{caseinsensitive} && /$qv/i or next;
+ /$qv/ || !$caseinsensitive && /$qv/i or next;
my @list = grep { defined $_ } map {
my $pkg = $urpm->{depslist}[$_];
- $pkg && ($options{src} ? $pkg->arch eq 'src' : $pkg->arch ne 'src')
+ $pkg && ($src ? $pkg->arch eq 'src' : $pkg->arch ne 'src')
? $pkg->id : undef;
} keys %{$urpm->{provides}{$_} || {}};
@list > 0 and push @{$found->{$v}}, join '|', @list;
@@ -2145,7 +2145,7 @@ sub search_packages {
}
if ($options{use_provides} && $options{fuzzy}) {
- _findindeps($urpm, \%found, $qv, $v, %options);
+ _findindeps($urpm, \%found, $qv, $v, $options{caseinsensitive}, $options{src});
}
foreach my $id (defined $urpm->{searchmedia} ?