From 34749e177db5d4aafdb9f3de630c7ab193a0f36d Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 12 Feb 2013 22:00:53 +1000 Subject: Perform limited conflict checking with --force Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae --- test/pacman/tests/upgrade046.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py index a02a7132..d9ac66b9 100644 --- a/test/pacman/tests/upgrade046.py +++ b/test/pacman/tests/upgrade046.py @@ -29,5 +29,3 @@ self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") - -self.expectfailure = True -- cgit v1.2.3-70-g09d2