From 4838d250e5fc258bdd52dc31098ed2ad0e44ee40 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Fri, 4 Dec 2015 14:14:32 -0500 Subject: skip conflicts resolved by file replacement When replacing a file with a directory, any files inside the new directory cannot possibly exist on the filesystem and can be skipped. This allows cross-package symlink-to-directory transitions when there are files with the same name under both the symlinked directory and the new directory. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/tests/symlink021.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py index 19a7f099..1ba7c025 100644 --- a/test/pacman/tests/symlink021.py +++ b/test/pacman/tests/symlink021.py @@ -24,5 +24,3 @@ self.addrule("FILE_TYPE=usr/include/foo|dir") self.addrule("!FILE_TYPE=usr/include/bar|link") self.addrule("FILE_EXIST=usr/include/foo/header.h") self.addrule("FILE_EXIST=usr/include/bar/header.h") - -self.expectfailure = True -- cgit v1.2.3-24-g4f1b