aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-11 13:39:06 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-11 13:39:06 +0000
commit96b9d16075ef21941a1d9a676d9976270a336b33 (patch)
tree7422823563082f8a24c6c0371de4da820178ca30
parent2da4d1cbc4de6d9cda3da008d85cb3a438dfd6e7 (diff)
downloadrpmdrake-96b9d16075ef21941a1d9a676d9976270a336b33.tar
rpmdrake-96b9d16075ef21941a1d9a676d9976270a336b33.tar.gz
rpmdrake-96b9d16075ef21941a1d9a676d9976270a336b33.tar.bz2
rpmdrake-96b9d16075ef21941a1d9a676d9976270a336b33.tar.xz
rpmdrake-96b9d16075ef21941a1d9a676d9976270a336b33.zip
(do_search) fix canceling file search
-rwxr-xr-xrpmdrake6
1 files changed, 5 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index 84148a9e..2c6181a3 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -133,7 +133,10 @@ sub do_search($$$$$$$) {
my $fn;
local $_;
while (<$F>) {
- $searchstop and last;
+ if ($searchstop) {
+ statusbar_msg(N("Search aborted"), 1);
+ goto end_search;
+ }
if (m!^<!) {
($fn) = /fn="(.*)"/;
$update_search_pb->();
@@ -157,6 +160,7 @@ sub do_search($$$$$$$) {
}
}
+ end_search:
@search_results = uniq(@search_results); #- there can be multiple packages with same version/release for different arch's
$searchw->destroy;
}