bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

query: avoid false ownership matches for files in root

Browse source 
Check for an exact match when querying ownership of files in the root.
Previously, our test was too simple and would match the the basename of
package files against the query parameter, e.g.

  $ pacman -Qo config
  /config is owned by cower-git 20120614-1

Adds a new test to verify this behavior, query007.py.

Fixes FS#30388.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2012-06-20 16:18:42 -04:00 • committed by Dan McGee
parent c6e47cb435
commit da0dcc29cf
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pacman/query.c
View file

@ -207,8 +207,10 @@ static int query_fileowner(alpm_list_t *targets)
/* for files in '/', there is no directory name to match */
if(!rpath) {
print_query_fileowner(filename, info);
found = 1;
if(strcmp(pkgfile, bname) == 0) {
print_query_fileowner(filename, info);
found = 1;
}
continue;
}

11
test/pacman/tests/query007.py Normal file
View file

@ -0,0 +1,11 @@
self.description = "Query ownership of file in root"
sp = pmpkg("dummy")
sp.files = ["etc/config"]
self.addpkg2db("local", sp)
self.filesystem = ["config"]
self.args = "-Qo /config"
self.addrule("PACMAN_RETCODE=1")