From 948f135a73dec553b6e9983740b0e501f3a6e8c2 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 21 Jul 2012 00:17:18 +1000 Subject: 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 --- test/pacman/tests/fileconflict013.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') 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 -- cgit v1.2.3-24-g4f1b