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, maint has been updated via 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (commit) via d7c3164fd5824f1e300d2c7ee92f5c2446461c03 (commit) via 44e9fdd0e848382337edb97d41e7317638a67bac (commit) via 717fdb8ee0fd23cf72fc7d2832317f513caefa2c (commit) via d6f31dc78852939f7f83648529887caca2ac9294 (commit) from 5de465d63efbb82da6127ac927ad29b9c8b1b542 (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 5c1ba2d5fd5263525a0355cdce900b58dc41c916 Author: Dave Reisner Date: Mon Jul 2 10:57:01 2012 -0400 makepkg.conf: add -q option for curl Avoid involving the user's ~/.curlrc file as this may alter the expected behavior of downloads. ref: https://bbs.archlinux.org/viewtopic.php?pid=1124441 Signed-off-by: Dave Reisner Signed-off-by: Dan McGee commit d7c3164fd5824f1e300d2c7ee92f5c2446461c03 Author: Dave Reisner Date: Wed Mar 28 20:22:18 2012 -0400 makepkg.conf: enable curl's cookie engine for http Implements FS#28098. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee commit 44e9fdd0e848382337edb97d41e7317638a67bac Author: Allan McRae Date: Sun Jul 8 23:58:37 2012 +1000 Check empty subdirectory ownership When checking if a package owns a directory, it is important to check not only that all the files in the directory are part of the package, but also if the directory is part of a package. This catches empty subdirectories during conflict checking for directory to file/symlink replacements. Signed-off-by: Allan McRae Signed-off-by: Dan McGee commit 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Author: Allan McRae Date: Sun Jul 8 21:36:36 2012 +1000 Add conflict for replacing owned empty directory When two packages own an empty directory, pacman finds no conflict when one of those packages wants to replace the directory with a file or a symlink. When it comes to actually extracting the new file/symlink, pacman sees the directory is still there (we do not remove empty directories if they are owned by a package) and refuses to extract. Detect this potential conflict early and bail. Note that it is a _potential_ conflict and not a guaranteed one as the other package owning the directory could be updated or removed first which would remove the conflict. However, pacman currently can not sort package installation order to ensure this, so this conflict requires manual upgrade ordering. Signed-off-by: Allan McRae Signed-off-by: Dan McGee commit d6f31dc78852939f7f83648529887caca2ac9294 Author: Ram Bhamidipaty Date: Tue Jun 26 22:02:18 2012 -0700 Add man page for pactree Add a man page for the pactree utility. Feedback-from: Allan McRae Feedback-from: Andrew Gregory Signed-off-by: Ram Bhamidipaty Signed-off-by: Dan McGee ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 4 +++ doc/pactree.8.txt | 62 ++++++++++++++++++++++++++++++++++ etc/makepkg.conf.in | 6 ++-- lib/libalpm/conflict.c | 37 ++++++++++++++++---- test/pacman/tests/fileconflict009.py | 20 +++++++++++ test/pacman/tests/fileconflict010.py | 20 +++++++++++ test/pacman/tests/fileconflict012.py | 17 ++++++++++ 8 files changed, 158 insertions(+), 9 deletions(-) create mode 100644 doc/pactree.8.txt create mode 100644 test/pacman/tests/fileconflict009.py create mode 100644 test/pacman/tests/fileconflict010.py create mode 100644 test/pacman/tests/fileconflict012.py hooks/post-receive -- The official pacman repository