summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-02-13 11:27:21 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-02-13 11:27:21 +0000
commitd9d51d48161223ff697f5019ec3e0a9e51663ccc (patch)
tree7f0ce4b40134860c91844a6383492c6e0ab146ae
parent2f54c9ca9198ab2cd73589dcbe7458c7242430a0 (diff)
downloadurpmi-d9d51d48161223ff697f5019ec3e0a9e51663ccc.tar
urpmi-d9d51d48161223ff697f5019ec3e0a9e51663ccc.tar.gz
urpmi-d9d51d48161223ff697f5019ec3e0a9e51663ccc.tar.bz2
urpmi-d9d51d48161223ff697f5019ec3e0a9e51663ccc.tar.xz
urpmi-d9d51d48161223ff697f5019ec3e0a9e51663ccc.zip
Make research of packages work with ignorearch option
-rw-r--r--urpm.pm5
-rwxr-xr-xurpmi22
2 files changed, 16 insertions, 11 deletions
diff --git a/urpm.pm b/urpm.pm
index 9e1e3618..d03a4647 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2166,7 +2166,10 @@ sub search_packages {
#- try to search through provides.
if (my @l = map {
$_
- && ($options{src} ? $_->arch eq 'src' : $_->is_arch_compat)
+ && ($options{ignorearch}
+ ? 1
+ : $options{src} ? $_->arch eq 'src' : $_->is_arch_compat
+ )
&& ($options{use_provides} || $_->name eq $v)
&& defined($_->id)
&& (!defined $urpm->{searchmedia} || (
diff --git a/urpmi b/urpmi
index 3871fab9..a2c4b71b 100755
--- a/urpmi
+++ b/urpmi
@@ -381,19 +381,21 @@ if ($bug) {
#- search the packages according to the selection given by the user.
if (@names) {
- $urpm->search_packages(\%requested, [ @names ],
- all => $all,
- use_provides => $use_provides,
- fuzzy => $urpm->{options}{fuzzy})
- || $force or exit 1;
+ $urpm->search_packages(
+ \%requested, [ @names ],
+ all => $all,
+ use_provides => $use_provides,
+ fuzzy => $urpm->{options}{fuzzy},
+ ignorearch => $urpm->{options}{ignorearch},
+ ) || $force or exit 1;
}
if (@src_names) {
$urpm->search_packages(\%requested, [ @src_names ],
- all => $all,
- use_provides => $use_provides,
- fuzzy => $urpm->{options}{fuzzy},
- src => 1)
- || $force or exit 1;
+ all => $all,
+ use_provides => $use_provides,
+ fuzzy => $urpm->{options}{fuzzy},
+ src => 1,
+ ) || $force or exit 1;
}
sub ask_choice {