From b6753eeb7ead3fa7bfdb053babe877319a722115 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Tue, 3 Jan 2017 02:06:22 -0500 Subject: conflict: skip dir children when replacing a file When replacing a file with a directory, any files under that directory do not need to be checked for conflicts. This prevents possible false-positive conflicts where the file being replaced is a symlink. We were already skipping the directory children when the file was owned by the previous version of a package being upgraded. This extends that to other packages being removed. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/tests/TESTS | 1 + 1 file changed, 1 insertion(+) (limited to 'test/pacman/tests/TESTS') diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index cfe50d23..11d1c38c 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/smoke001.py TESTS += test/pacman/tests/smoke002.py TESTS += test/pacman/tests/smoke003.py TESTS += test/pacman/tests/smoke004.py +TESTS += test/pacman/tests/symlink-replace-with-dir.py TESTS += test/pacman/tests/symlink001.py TESTS += test/pacman/tests/symlink002.py TESTS += test/pacman/tests/symlink010.py -- cgit v1.2.3-70-g09d2