aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-09 12:33:15 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-09 12:33:15 +0000
commit2df9fe6ec366cd3ea86dd08a3249516b1083e105 (patch)
tree05e0dbdc3c9e2b8fd1bf8029f4fd1ab68abcd524
parent666334bc28e9058d95b394a889d7d70cc66c58ca (diff)
downloadrpmdrake-2df9fe6ec366cd3ea86dd08a3249516b1083e105.tar
rpmdrake-2df9fe6ec366cd3ea86dd08a3249516b1083e105.tar.gz
rpmdrake-2df9fe6ec366cd3ea86dd08a3249516b1083e105.tar.bz2
rpmdrake-2df9fe6ec366cd3ea86dd08a3249516b1083e105.tar.xz
rpmdrake-2df9fe6ec366cd3ea86dd08a3249516b1083e105.zip
(do_search) fix searching on just names by restoring previous logic (#54339)
got broken in r261170 from 2009-10-01 ("enable to search in full or short package names (#46473)") which is simpler
-rw-r--r--NEWS3
-rwxr-xr-xrpmdrake5
2 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 0b81fc5e..d668e51a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- rpmdrake
+ o fix searching on just names (#54339)
+
Version 5.20 - 2 October 2009, Thierry Vignaud
- rpmdrake
diff --git a/rpmdrake b/rpmdrake
index 35af41e7..6eeb80c5 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -78,10 +78,7 @@ sub do_search($$$$$$$) {
if ($NVR_searches->[0]) {
next if !/$entry_rx/;
} else {
- if (/^([^-]*)-/) {
- my $name = $1;
- next if /^(.*)-/ and $name !~ /$entry_rx/;
- }
+ next if first(split_fullname($_)) !~ /$entry_rx/
}
push @search_results, $_;
# FIXME: should be done for all research types