moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

pacsearch: indexing by 'name version' instead of 'name' 

In the old pacsearch, packages were identified uniquely by pkgfields[1], which
contained pkgname+pkgver. Since commit 4d13558 pkgver is stored in pkgfields[2],
and packages have been identified with pkgfields[1] only. Because of that
packages with a different version would appear once only.

This fixes the regression by identifying packages with both pkgfields[1] and
pkgfields[2].

Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Pierre Neidhardt 2014-02-09 19:41:40 +01:00 committed by Allan McRae
parent 08cddb4b4b
commit fe961e6590
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pacsearch.in
View File

@ -124,7 +124,7 @@ foreach $_ (@syncpkgs) {
# add a last field that indicates original order
push (@pkgfields, $cnt++);
# add each sync pkg by name/ver to a hash table for quick lookup
$allpkgs{$pkgfields[1]} = [ @pkgfields ];
$allpkgs{$pkgfields[1] . $pkgfields[2]} = [ @pkgfields ];
}
my $queryout = `pacman -Qs '@ARGV'`;
@ -141,14 +141,14 @@ foreach $_ (@querypkgs) {
# skip any non-matching line
next if not defined $pkgfields[1];
# check if the package was listed in the sync out
if (not exists $allpkgs{$pkgfields[1]}) {
if (not exists $allpkgs{$pkgfields[1] . $pkgfields[2]}) {
# since 'group' is optional, we should fill it in if necessary
$pkgfields[3] = "" if not defined $pkgfields[3];
$pkgfields[4] = "[$LC_INSTALLED]";
# add a last field that indicates original order (after sync)
push (@pkgfields, $cnt++);
# add our local-only package to the hash
$allpkgs{$pkgfields[1]} = [ @pkgfields ];
$allpkgs{$pkgfields[1] . $pkgfields[2]} = [ @pkgfields ];
}
}