On 27/04/13 10:00, Andrew Gregory wrote:
Two weeks with no objections, so here is the full patchset. Several of the tests should be redundant now, but I left them in with updated rules anyway, just in case.
Also available on my no-symlinks branch for those interested.
Andrew Gregory (8): update tests for symlink support removal alpm_filelist: remove resolved_path conflict.c: do not ignore symlink<->dir conflicts conflict.c: use real path for filesystem checks extract_single_file: consolidate symlink cases unlink_file: treat symlinks like normal files query_fileowner: remove symlink support improve dir->file transition conflict resolution
Finally got through the last of these I had in my review queue. As it stands, you symlinks branch is good to go. However, there are two things I am considering before merging this: 1) Arch will finish the /usr merge in the near future (weeks, not months). As a reasonable proportion of people running pacman-git have done silly things like symlink /bin -> usr/bin already and thus need the old behaviour, I think we should merge after the transition is done. (One person is a reasonable portion!). 2) We need to figure out how to update peoples dbs where they have paths that assume directories which are really symlinks. Attached is a really bad script to list packages with issues. I'm sure this can be improved... The question remains, do we want to encourage a "pacman-db-upgrade" run here, or something else? Unlike the last db-upgrade, we can not detect whether this needs to be run or not - so I don't think that is the way to go. Allan