summaryrefslogtreecommitdiffstats
path: root/test/scripts/Makefile.am
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-02-12 13:00:53 +0100
committerAllan McRae <allan@archlinux.org>2013-02-24 04:11:54 +0100
commit34749e177db5d4aafdb9f3de630c7ab193a0f36d (patch)
tree93d21fc0a0c170589acf19617e15cd9d9d8949d1 /test/scripts/Makefile.am
parent19754b34a36203266c4e02f29178084c77282efd (diff)
downloadpacman-34749e177db5d4aafdb9f3de630c7ab193a0f36d.tar.gz
pacman-34749e177db5d4aafdb9f3de630c7ab193a0f36d.tar.xz
Perform limited conflict checking with --force
Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/scripts/Makefile.am')
0 files changed, 0 insertions, 0 deletions