summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-04-13 04:26:14 +0200
committerAllan McRae <allan@archlinux.org>2013-06-03 05:33:47 +0200
commitcbbd3781c249c8318934fe0810a09546c2760f53 (patch)
tree8cdbfbdef89f5a4a58f8c62878c85ddf13f537a9 /scripts
parent47762ab687959e48acc2de8592fcf3ba3cfa502b (diff)
downloadpacman-cbbd3781c249c8318934fe0810a09546c2760f53.tar.gz
pacman-cbbd3781c249c8318934fe0810a09546c2760f53.tar.xz
improve dir->file transition conflict resolution
Packages removed due to conflicts are always removed at the beginning of the transaction and as such can be included in the check for whether all owners of a directory will be removed in a transaction. Installed versions of packages being upgraded, other than the one with the conflict, cannot be used because our transaction ordering is not intelligent enough to ensure that they are removed prior to the installation of the conflicted package. Also, return false from dir_belongsto_pkgs on errors. Previously, we simply continued which could return true even if we were unable to actually establish that the package owned the entire tree. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions