From e3772f765474b4678beec6d88e3a1c56fd591aa4 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 11 Jul 2012 11:36:36 +1000 Subject: Add pactest for empty subdirectory conflict The wrong test file was inadvertantly committed in 44e9fdd0. Add the correct test and tidy up the test which was committed. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- test/pacman/tests/fileconflict012.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/pacman/tests/fileconflict012.py') diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py index 421b739a..95ab5681 100644 --- a/test/pacman/tests/fileconflict012.py +++ b/test/pacman/tests/fileconflict012.py @@ -14,4 +14,4 @@ self.args = "-S pkg1" self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("DIR_EXIST=dir/") +self.addrule("FILE_EXIST=dir/file") -- cgit v1.2.3-24-g4f1b