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 ec5e6d90294f3322b7015b422db948770ecb41b6 (commit) via d46bb6b27b05579acf5665368c111b4cc41eedcb (commit) via 72d3713cc7865af5f4d91410ad56ed4287be6109 (commit) via 70d8c2150e33d1a0b9e09d72c5091d661383d641 (commit) via 41dae689520b0af0b5226117e77572a24954f075 (commit) via fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 (commit) via eb871553912f5cf4ab3cb8aade73cf2a24dcb82c (commit) via 6f47dfc9203e45ef91afdc772c27eb7034bf6590 (commit) via e3772f765474b4678beec6d88e3a1c56fd591aa4 (commit) via 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 (commit) from 7193ce1ecd0089545d100fd11647cb346d15331b (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 ec5e6d90294f3322b7015b422db948770ecb41b6 Author: Pierre Schmitz <pierre@archlinux.de> Date: Mon Jun 18 16:46:25 2012 +0200 pacman-key: Use lsign_keys function in --populate This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre@archlinux.de> commit d46bb6b27b05579acf5665368c111b4cc41eedcb Author: Allan McRae <allan@archlinux.org> Date: Wed Jul 18 12:09:24 2012 +1000 Split _alpm_filelist_operation function To improve conflict checking, we will need to make these functions diverge to an extent where having two separate functions will be preferable. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 72d3713cc7865af5f4d91410ad56ed4287be6109 Author: Dan McGee <dan@archlinux.org> Date: Thu Jul 12 15:29:59 2012 -0500 Move filelist functions into separate source file We have a few of these and might as well gather them together. This also cleans up the code a bit by using an enum instead of integer values, as well as makes a "search for file in filelist" function public so frontends can do better than straight linear search of the filelists. Signed-off-by: Dan McGee <dan@archlinux.org> commit 70d8c2150e33d1a0b9e09d72c5091d661383d641 Author: Dave Reisner <dreisner@archlinux.org> Date: Wed Jul 18 09:46:53 2012 +1000 pactest: avoid upgrade conflict with unchanged effective path Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 41dae689520b0af0b5226117e77572a24954f075 Author: Allan McRae <allan@archlinux.org> Date: Tue Jul 17 19:13:03 2012 +1000 pactest: Do not remove symlink to directory if a to be installed package uses it If a pacakge has a directory symlink (e.g. /lib -> usr/lib), do not allow it to be removed if any other package is trying to install a file into that path (e.g. /lib/foo). This is because the local database can become invalidated if the symlink is removed after the package with file /lib/foo is installed (sync702.py). If the symlink is removed before the file is installed (sync701.py), the upgrade is actually a success, but we can not guarantee the ordering so both cases should fail. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit fa2eadcec75e8e54a4bb3cf1f38a07ec71784032 Author: Allan McRae <allan@archlinux.org> Date: Tue Jul 17 13:22:08 2012 +1000 pactest: Do not remove symlink to directory if local package uses that path If we have a symlink to a directory (e.g. /lib -> usr/lib), then we can not remove it if a local package thinks it has files in the symlink directory (e.g. /lib/foo), because this will invalidate the local file database. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit eb871553912f5cf4ab3cb8aade73cf2a24dcb82c Author: Allan McRae <allan@archlinux.org> Date: Tue Jul 17 01:26:54 2012 +1000 pactest: conflict between files having same effective path Note failure to detect a conflict between files having the same effective path across packages due to a directory symlink. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 6f47dfc9203e45ef91afdc772c27eb7034bf6590 Author: Allan McRae <allan@archlinux.org> Date: Tue Jul 17 01:15:53 2012 +1000 pactest: conflict between directory and a file Note failure to detect a conflict between a directory in one package and a file in the other when the directory is not currently on the filesystem. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit e3772f765474b4678beec6d88e3a1c56fd591aa4 Author: Allan McRae <allan@archlinux.org> Date: Wed Jul 11 11:36:36 2012 +1000 Add pactest for empty subdirectory conflict The wrong test file was inadvertantly committed in 44e9fdd0. Add the correct test and tidy up the test which was committed. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 49dbebcc36e33f1df88a12b63cc3876838eb9dc5 Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Date: Sat Jun 16 01:12:22 2012 +0200 Allow cleaning only some cachedirs When cleaning the cache, ask for each cachedir separately. Allan: add some white space in output Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 16 ++- lib/libalpm/be_local.c | 1 + lib/libalpm/be_package.c | 1 + lib/libalpm/conflict.c | 105 +++------------ lib/libalpm/conflict.h | 3 - lib/libalpm/filelist.c | 137 ++++++++++++++++++++ lib/libalpm/{group.h => filelist.h} | 21 +-- lib/libalpm/package.c | 9 -- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 8 +- scripts/pacman-key.sh.in | 3 +- src/pacman/sync.c | 35 ++--- .../{fileconflict012.py => fileconflict011.py} | 6 +- test/pacman/tests/fileconflict012.py | 2 +- test/pacman/tests/fileconflict013.py | 22 ++++ test/pacman/tests/fileconflict015.py | 17 +++ test/pacman/tests/fileconflict016.py | 23 ++++ test/pacman/tests/sync700.py | 22 ++++ test/pacman/tests/sync701.py | 22 ++++ test/pacman/tests/sync702.py | 22 ++++ 21 files changed, 341 insertions(+), 136 deletions(-) create mode 100644 lib/libalpm/filelist.c copy lib/libalpm/{group.h => filelist.h} (63%) copy test/pacman/tests/{fileconflict012.py => fileconflict011.py} (74%) create mode 100644 test/pacman/tests/fileconflict013.py create mode 100644 test/pacman/tests/fileconflict015.py create mode 100644 test/pacman/tests/fileconflict016.py create mode 100644 test/pacman/tests/sync700.py create mode 100644 test/pacman/tests/sync701.py create mode 100644 test/pacman/tests/sync702.py hooks/post-receive -- The official pacman repository