aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-08-22 18:33:25 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-08-22 18:33:25 +0000
commitc28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a (patch)
treec82bfb341824c774d428e2ff25f5d292bf1a59f4
parent3ebe622d94330270836e7c8b36eeef2140cf3487 (diff)
downloadrpmdrake-c28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a.tar
rpmdrake-c28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a.tar.gz
rpmdrake-c28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a.tar.bz2
rpmdrake-c28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a.tar.xz
rpmdrake-c28d36ad5cb136e987c4ff3e0e37eb1f3fed2a7a.zip
in MandrakeUpdate, limit parsehdlist searches to update hdlists
only
-rwxr-xr-xrpmdrake3
1 files changed, 2 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index e203064c..e16c25ed 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -135,7 +135,8 @@ sub do_search($$$$$$) {
if ($MODE eq 'remove') {
@search_results = map { if_(eval { ($pkgs->{$_}{summary}.$pkgs->{$_}{description}) =~ /$entry/i }, $_) } keys %$pkgs;
} else {
- my @hdlists = map { my $h = "$urpm->{statedir}/$_->{hdlist}"; if_(!$_->{ignore} && (-r $h), $h) } @{$urpm->{media}};
+ my @hdlists = map { my $h = "$urpm->{statedir}/$_->{hdlist}";
+ if_(!$_->{ignore} && (!($MODE eq 'update') || $_->{update}) && (-r $h), $h) } @{$urpm->{media}};
my $total_size = sum(map { my $pack; eval { $pack = new packdrake($_, quiet => 1) } ? $pack->{toc_f_count} : 0 } @hdlists);
my $searchstop;
my $searchw = my_gtk->new;