summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-07-21 00:17:18 +1000
committerAllan McRae <allan@archlinux.org>2012-12-14 12:35:34 +1000
commit948f135a73dec553b6e9983740b0e501f3a6e8c2 (patch)
tree2353445ccd22405aa415cbe4943bda1ba54f084d /test
parent88e7ea421ebbef86daa20ee0f9aff768a445b467 (diff)
downloadpacman-948f135a73dec553b6e9983740b0e501f3a6e8c2.tar.xz
Avoid upgrade conflict with unchanged effective path
This applies to a case such as when /lib is a symlink to /usr/lib. If a package is installed which contains /lib/libfoo.so, pacman will complain if this package is then "fixed" to contain /usr/lib/libfoo.so. Since these have the same effective path and it exists within the same package, ignore the conflict. Fixes FS#30681. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/fileconflict013.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict013.py b/test/pacman/tests/fileconflict013.py
index 521b62e8..a83923c6 100644
--- a/test/pacman/tests/fileconflict013.py
+++ b/test/pacman/tests/fileconflict013.py
@@ -18,5 +18,3 @@ self.args = "-Su"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
-
-self.expectfailure = True