[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.1-43-gcbbd378
Allan McRae
allan at archlinux.org
Sun Jun 2 23:34:47 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The official pacman repository".
The branch, master has been updated
via cbbd3781c249c8318934fe0810a09546c2760f53 (commit)
via 47762ab687959e48acc2de8592fcf3ba3cfa502b (commit)
via b1e495b88d77744085a6d0ea8d2b4480b9063409 (commit)
via bc3e73fc8f7890d82c78c2ea54a63da440bac147 (commit)
via c91d9484868f35e17dccc447d8c29cbb7978fb4f (commit)
via 0b3d04719db189ad7dbc8b36b5f34d95a5c63646 (commit)
via aa7e42db11ea545572a9519e88e2a6cdeeffb3bf (commit)
via 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (commit)
via 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (commit)
from 9ca423b981c897c7d3894c5b394c23d786e4ba37 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cbbd3781c249c8318934fe0810a09546c2760f53
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Fri Apr 12 22:26:14 2013 -0400
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 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 47762ab687959e48acc2de8592fcf3ba3cfa502b
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Sat Apr 13 17:31:08 2013 -0400
query_fileowner: remove symlink support
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit b1e495b88d77744085a6d0ea8d2b4480b9063409
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Sun Mar 10 15:25:49 2013 -0400
unlink_file: treat symlinks like normal files
We always want to work with the package file itself, not its target if
it's a symlink.
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit bc3e73fc8f7890d82c78c2ea54a63da440bac147
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Sun Mar 10 15:34:52 2013 -0400
extract_single_file: consolidate symlink cases
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit c91d9484868f35e17dccc447d8c29cbb7978fb4f
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Fri May 10 16:26:19 2013 -0400
conflict.c: check for file -> dir replacements
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 0b3d04719db189ad7dbc8b36b5f34d95a5c63646
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Fri May 10 16:44:33 2013 -0400
conflict.c: exclude trailing slash from file path
After the initial checks, we either use the path as a directory and have
to append the trailing slash anyway or use it as a file in which case
the trailing slash should be excluded.
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit aa7e42db11ea545572a9519e88e2a6cdeeffb3bf
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Fri Apr 12 20:45:00 2013 -0400
conflict.c: do not ignore symlink<->dir conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Fri Apr 12 20:37:56 2013 -0400
alpm_filelist: remove resolved_path
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c
Author: Andrew Gregory <andrew.gregory.8 at gmail.com>
Date: Sat Mar 2 23:26:56 2013 -0500
update tests for symlink support removal
Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
lib/libalpm/add.c | 56 ++---
lib/libalpm/alpm.h | 3 +-
lib/libalpm/conflict.c | 201 +++++++++---------
lib/libalpm/filelist.c | 225 +--------------------
lib/libalpm/filelist.h | 4 -
lib/libalpm/package.c | 22 +-
lib/libalpm/remove.c | 11 +-
src/pacman/query.c | 137 ++++++-------
test/pacman/tests/fileconflict007.py | 1 +
test/pacman/tests/fileconflict013.py | 5 +-
test/pacman/tests/fileconflict022.py | 1 -
test/pacman/tests/fileconflict023.py | 7 +-
test/pacman/tests/fileconflict025.py | 8 +-
.../{fileconflict023.py => fileconflict030.py} | 11 +-
test/pacman/tests/symlink001.py | 9 +-
test/pacman/tests/symlink020.py | 20 ++
test/pacman/tests/sync700.py | 12 +-
test/pacman/tests/sync701.py | 11 +-
test/pacman/tests/sync702.py | 11 +-
test/pacman/tests/upgrade045.py | 3 +-
20 files changed, 246 insertions(+), 512 deletions(-)
copy test/pacman/tests/{fileconflict023.py => fileconflict030.py} (50%)
create mode 100644 test/pacman/tests/symlink020.py
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list