From aa7e42db11ea545572a9519e88e2a6cdeeffb3bf Mon Sep 17 00:00:00 2001
From: Andrew Gregory <andrew.gregory.8@gmail.com>
Date: Fri, 12 Apr 2013 20:45:00 -0400
Subject: 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>
---
 test/pacman/tests/fileconflict007.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/pacman/tests/fileconflict007.py')

diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py
index 7fe65ed4..b61ddb42 100644
--- a/test/pacman/tests/fileconflict007.py
+++ b/test/pacman/tests/fileconflict007.py
@@ -16,3 +16,5 @@
 self.addrule("PKG_EXIST=pkg")
 self.addrule("PKG_VERSION=pkg|1.0-2")
 self.addrule("FILE_TYPE=dir/symdir/|dir")
+
+self.expectfailure = True
-- 
cgit v1.2.3-54-g00ecf