diff options
| author | Allan McRae <allan@archlinux.org> | 2012-07-11 11:36:36 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-08-02 09:37:48 -0500 |
| commit | e3772f765474b4678beec6d88e3a1c56fd591aa4 (patch) | |
| tree | 26c1873a02b686959c8bf5af400158915d440d3b /test/pacman/tests/fileconflict012.py | |
| parent | 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 (diff) | |
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 <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict012.py')
| -rw-r--r-- | test/pacman/tests/fileconflict012.py | 2 |
1 files changed, 1 insertions, 1 deletions
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") |