On Fri, Jul 17, 2009 at 3:10 PM, Xavier<shiningxc@gmail.com> wrote:
I am not sure what to do. It seems the situation of fileconflict004 happens regularly, see for example : http://www.archlinux.org/news/444/ And I believe there were also other cases since 3.2 was released.
So maybe we should implement the pseudo-code that Nagy proposed above. I have a simple patch locally which works.
Then fileconflict005 fails, but this is probably a less common situation. And pacman will just fail to detect the file conflict, and skip the extraction of a file or a symlink (because a non-empty directory exists). Though, I don't understand why pacman shows an error in case of a file, and nothing (only a debug message) in case of a symlink (case of fileconflict005). So I would suggest displaying an error in case of a symlink as well, to have an output as follows:
checking package integrity... checking for file conflicts... upgrading pkg1... error: extract: skipping symlink extraction of test error: problem occurred while upgrading pkg1
I am not completely sure it is the right move, but in any cases, it shouldn't hurt much as this is just the pre-3.2 behavior. So attached a patch.