34749e177d
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> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| asciidoc-override.css | ||
| asciidoc.conf | ||
| Doxyfile | ||
| footer.txt | ||
| index.txt | ||
| libalpm.3.txt | ||
| Makefile.am | ||
| makepkg.8.txt | ||
| makepkg.conf.5.txt | ||
| pacman-key.8.txt | ||
| pacman.8.txt | ||
| pacman.conf.5.txt | ||
| pactree.8.txt | ||
| PKGBUILD-example.txt | ||
| PKGBUILD.5.txt | ||
| pkgdelta.8.txt | ||
| repo-add.8.txt | ||
| submitting-patches.txt | ||
| translation-help.txt | ||
| vercmp.8.txt | ||