summaryrefslogtreecommitdiff
path: root/test/pacman/tests/TESTS
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2017-01-03 02:06:22 -0500
committerAllan McRae <allan@archlinux.org>2017-01-04 13:59:15 +1000
commitb6753eeb7ead3fa7bfdb053babe877319a722115 (patch)
treea52ce452c8be2d07741c5dd9738819accc3e799d /test/pacman/tests/TESTS
parent8a19c4a78251c5e34ecf508a65d943ca2dc833c7 (diff)
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 <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/TESTS')
-rw-r--r--test/pacman/tests/TESTS1
1 files changed, 1 insertions, 0 deletions
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