From bfd6817112b34b552e9139bdc582d048bcba38b9 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Fri, 17 Jul 2009 15:48:57 +0200 Subject: Fix fileconflict004 When one package wants to replace a directory by a file, we check that all files in that directory were owned by that package. Additionally pacman can be more verbose when the extraction of the symlink (or file) fails. The patch to add.c looks more complex than it is, I just moved and reindented code to handle cases 10 and 11 together. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- pactest/tests/fileconflict004.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pactest/tests/fileconflict004.py') diff --git a/pactest/tests/fileconflict004.py b/pactest/tests/fileconflict004.py index 2396cedb..a5347ccd 100644 --- a/pactest/tests/fileconflict004.py +++ b/pactest/tests/fileconflict004.py @@ -17,5 +17,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg1|2.0-1") self.addrule("FILE_TYPE=test|link") - -self.expectfailure = True -- cgit v1.2.3-70-g09d2