Add conflict for replacing owned empty directory
commit717fdb8ee0fd23cf72fc7d2832317f513caefa2c
authorAllan McRae <allan@archlinux.org>
Sun, 8 Jul 2012 11:36:36 +0000 (8 21:36 +1000)
committerDan McGee <dan@archlinux.org>
Tue, 10 Jul 2012 13:29:37 +0000 (10 08:29 -0500)
tree4a3b8dbeda142e77e871df3fcbf74a1f06b58df9
parentd6f31dc78852939f7f83648529887caca2ac9294
Add conflict for replacing owned empty directory

When two packages own an empty directory, pacman finds no conflict when
one of those packages wants to replace the directory with a file or a
symlink.  When it comes to actually extracting the new file/symlink,
pacman sees the directory is still there (we do not remove empty
directories if they are owned by a package) and refuses to extract.

Detect this potential conflict early and bail. Note that it is a
_potential_ conflict and not a guaranteed one as the other package owning
the directory could be updated or removed first which would remove
the conflict.  However, pacman currently can not sort package installation
order to ensure this, so this conflict requires manual upgrade ordering.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
lib/libalpm/conflict.c
test/pacman/tests/fileconflict009.py [new file with mode: 0644]
test/pacman/tests/fileconflict010.py [new file with mode: 0644]