summaryrefslogtreecommitdiff
path: root/test/pacman/tests
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-02-19 19:41:39 -0500
committerAllan McRae <allan@archlinux.org>2013-02-24 13:11:54 +1000
commit19754b34a36203266c4e02f29178084c77282efd (patch)
treeb08b873b0f1ccc5b5b382a6c55f7925b31968561 /test/pacman/tests
parent083ac51816323d69fcf2e271ccd52add3cdd6d22 (diff)
use resolved_path for filelist_contains
alpm_filelist_contains was being used to search for resolved paths, but searching in the unresolved paths, causing it to miss matches. We always search unresolved paths and search the resolved paths if available because _alpm_filelist_resolve is not public and requires a context handle, so it can't be called from alpm_filelist_contains. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests')
-rw-r--r--test/pacman/tests/fileconflict023.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict023.py b/test/pacman/tests/fileconflict023.py
index 1310b680..ce72087b 100644
--- a/test/pacman/tests/fileconflict023.py
+++ b/test/pacman/tests/fileconflict023.py
@@ -16,5 +16,3 @@ self.args = "-S %s --ask=4" % sp1.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=foo")
self.addrule("PKG_EXIST=bar")
-
-self.expectfailure = True