diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-13 02:45:00 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-03 05:33:47 +0200 |
| commit | aa7e42db11ea545572a9519e88e2a6cdeeffb3bf (patch) | |
| tree | a1fdf2b0e1f9e72326573a3d03b68c969523b1b0 /test/pacman/tests/fileconflict022.py | |
| parent | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (diff) | |
| download | pacman-aa7e42db11ea545572a9519e88e2a6cdeeffb3bf.tar.gz pacman-aa7e42db11ea545572a9519e88e2a6cdeeffb3bf.tar.xz | |
conflict.c: do not ignore symlink<->dir conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict022.py')
| -rw-r--r-- | test/pacman/tests/fileconflict022.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py index b3920dfd..5ff0b537 100644 --- a/test/pacman/tests/fileconflict022.py +++ b/test/pacman/tests/fileconflict022.py @@ -16,5 +16,3 @@ self.args = "-S %s %s" % (sp1.name, sp2.name) self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") - -self.expectfailure = True |