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 8e2648bf02b44a7dc82429327c08cbfd2426ac30 (commit) via 3d142fe8ef70517cb44146d1892709cad3eb9b4f (commit) via 63baba13ecc003a0e083980dc7d036c66518d232 (commit) via 972528c021606934da85aef1d9223dea1d40e2c6 (commit) via 34749e177db5d4aafdb9f3de630c7ab193a0f36d (commit) via 19754b34a36203266c4e02f29178084c77282efd (commit) via 083ac51816323d69fcf2e271ccd52add3cdd6d22 (commit) via 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef (commit) via 4a1d93b92c76bde58193083812dda94c0fa5d373 (commit) via 0bbc406ee8773ed646393cee175280c33fea8dff (commit) from 8803ae3b4d5d90249243b664b02695f7b106b02f (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 8e2648bf02b44a7dc82429327c08cbfd2426ac30 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Tue Feb 19 20:34:33 2013 -0500 add SYMEXPORT to alpm_filelist_contains alpm_filelist_contains is listed in alpm.h and should be public but was not exported. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 3d142fe8ef70517cb44146d1892709cad3eb9b4f Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Feb 17 21:55:00 2013 -0500 dload: don't download sig if package is found in cache Avoids the segfault seen in FS#33911. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit 63baba13ecc003a0e083980dc7d036c66518d232 Author: Richard Pougnet <richard@pougnet.ca> Date: Fri Feb 15 22:59:57 2013 -0500 Provide full path names in warning messages Fix FS#31556 by printing filename instead of entryname. Thus, removing a lot of confusion from the output. Signed-off-by: Allan McRae <allan@archlinux.org> commit 972528c021606934da85aef1d9223dea1d40e2c6 Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Feb 17 12:02:20 2013 -0500 paccache: use xargs to execute mv/rm commands This removes the restriction on the length of the command line, as xargs will work around by running multiple instances of the command for us. As seen: https://bbs.archlinux.org/viewtopic.php?pid=1232959 Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit 34749e177db5d4aafdb9f3de630c7ab193a0f36d Author: Allan McRae <allan@archlinux.org> Date: Tue Feb 12 22:00:53 2013 +1000 Perform limited conflict checking with --force Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae <allan@archlinux.org> commit 19754b34a36203266c4e02f29178084c77282efd Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Tue Feb 19 19:41:39 2013 -0500 use resolved_path for filelist_contains alpm_filelist_contains was being used to search for resolved paths, but searching in the unresolved paths, causing it to miss matches. We always search unresolved paths and search the resolved paths if available because _alpm_filelist_resolve is not public and requires a context handle, so it can't be called from alpm_filelist_contains. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 083ac51816323d69fcf2e271ccd52add3cdd6d22 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Fri Feb 15 19:22:15 2013 -0500 return resolved paths from filelist_difference We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The extra file_t information was only being used to determine if the file was a directory which can be accomplished by testing for a trailing slash, so just return the resolved path. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Fri Feb 15 19:21:35 2013 -0500 return resolved paths from filelist_intersection We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The additional file_t information was never used, so just return the resolved path. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 4a1d93b92c76bde58193083812dda94c0fa5d373 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Fri Feb 15 18:13:51 2013 -0500 add fileconflict tests for cases with symlinks Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 0bbc406ee8773ed646393cee175280c33fea8dff Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Fri Feb 15 13:08:32 2013 -0500 use alpm_list_free on filelist intersection alpm_filelist_intersection returns a list of pointers to internal file_t struct's, so only the list itself should be freed. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 4 +- doc/pacman.8.txt | 2 + lib/libalpm/add.c | 19 ++++----- lib/libalpm/alpm.h | 2 +- lib/libalpm/conflict.c | 75 +++++++++++++++++++++++------------- lib/libalpm/dload.c | 2 +- lib/libalpm/filelist.c | 27 ++++++++----- lib/libalpm/remove.c | 3 ++ lib/libalpm/sync.c | 2 +- src/pacman/sync.c | 3 ++ test/pacman/tests/fileconflict022.py | 19 +++++++++ test/pacman/tests/fileconflict023.py | 18 +++++++++ test/pacman/tests/fileconflict024.py | 17 ++++++++ test/pacman/tests/fileconflict025.py | 18 +++++++++ test/pacman/tests/upgrade046.py | 2 - 15 files changed, 160 insertions(+), 53 deletions(-) create mode 100644 test/pacman/tests/fileconflict022.py create mode 100644 test/pacman/tests/fileconflict023.py create mode 100644 test/pacman/tests/fileconflict024.py create mode 100644 test/pacman/tests/fileconflict025.py hooks/post-receive -- The official pacman repository