aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-11-30 13:14:02 +0000
committerThierry Vignaud <tv@mandriva.org>2006-11-30 13:14:02 +0000
commit86d42a4226c0f5bba9c1791d793aa2bb04ffca03 (patch)
tree18c3980caf2827574c07aca0d5831cfda628d317
parenta67f3ec6d6d5b81e94b019698aefac6134fda6c1 (diff)
downloadrpmdrake-86d42a4226c0f5bba9c1791d793aa2bb04ffca03.tar
rpmdrake-86d42a4226c0f5bba9c1791d793aa2bb04ffca03.tar.gz
rpmdrake-86d42a4226c0f5bba9c1791d793aa2bb04ffca03.tar.bz2
rpmdrake-86d42a4226c0f5bba9c1791d793aa2bb04ffca03.tar.xz
rpmdrake-86d42a4226c0f5bba9c1791d793aa2bb04ffca03.zip
(do_search) fix matching packages when performing searches whithin hdlists (we
now internally consider <name>-<ver>-<rel>.<arch> instead of just <name>-<ver>-<rel>)
-rwxr-xr-xrpmdrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 021bee77..142542de 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -587,8 +587,8 @@ sub do_search($$$$$$$) {
local $_;
while (<$sf>) {
$searchstop and last;
- if (/^NAME<([^>]+)> VERSION<([^>]+)> RELEASE<([^>]+)>/) {
- $pkg = "$1-$2-$3";
+ if (/^NAME<([^>]+)> VERSION<([^>]+)> RELEASE<([^>]+)> ARCH<([^>]+)>/) {
+ $pkg = "$1-$2-$3.$4";
$progresscount++; $progresscount <= $total_size and $searchprogress->set_fraction($progresscount/$total_size);
$searchw->flush;
next;