diff options
| author | Allan McRae <allan@archlinux.org> | 2012-07-20 14:25:18 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2012-12-14 03:35:34 +0100 |
| commit | 88e7ea421ebbef86daa20ee0f9aff768a445b467 (patch) | |
| tree | d81396c992d4282273e6243dc6d33fe835f10458 /test/pacman/tests/fileconflict001.py | |
| parent | 28d404f16aca8ae1b7640b32c221c8b8860f8ce0 (diff) | |
| download | pacman-88e7ea421ebbef86daa20ee0f9aff768a445b467.tar.gz pacman-88e7ea421ebbef86daa20ee0f9aff768a445b467.tar.xz | |
Resolve file paths during inter-package conflict check
File paths are resolved if necessary during inter-package conflict
checks so that packages carrying the same effective file due to
directory symlinks on the filesystem are flagged as conflicting.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict001.py')
| -rw-r--r-- | test/pacman/tests/fileconflict001.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index e1371f88..b1ad5e18 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -25,5 +25,3 @@ self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") self.addrule("FILE_EXIST=dir/realdir/realfile") self.addrule("!FILE_EXIST=dir/realdir/file") - -self.expectfailure = True |