From 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Fri, 15 Feb 2013 19:21:35 -0500 Subject: return resolved paths from filelist_intersection We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The additional file_t information was never used, so just return the resolved path. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/tests/fileconflict022.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'test/pacman') diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py index 6f9aec93..5759d4c3 100644 --- a/test/pacman/tests/fileconflict022.py +++ b/test/pacman/tests/fileconflict022.py @@ -17,5 +17,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("PACMAN_OUTPUT=.*/usr/lib/file exists in both 'foo' and 'bar'") self.addrule("!PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") - -self.expectfailure = True -- cgit v1.2.3-70-g09d2