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 3849c3aec130601572b9e06b42bb6af5938936de (commit) via 326c6a8eed60bfd6aa0d653dad722d8637022d68 (commit) via 5bbe34293258c20afa636ca8f6546640af28678a (commit) via f8892b9d087f5c60de663d107643085deaba727b (commit) via 31d95b867919b02774f4a98b25d2f997c2985600 (commit) via 78adb71f20ee335dff49e34d33f04817a40002b6 (commit) via fe659153d5971e41b7483bb40c31cd40f58f9d9c (commit) via 4899b5bd864919830fe4ce5786d37a00ab5a0da3 (commit) via ca4142714137b16feabac09c4cda86b0a75036f8 (commit) via 242006933d31c88b844f8f8d0c2f0806763cc51f (commit) via 85712814cdbfa301e5827fafd6bfb8ac0886079c (commit) via 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 (commit) via edd81f3e8b505be2f7c7a18d3c28956b82264c45 (commit) via 6c78f0d56007ae5bbbaf9f15f6399e6e2967dd76 (commit) via 13a1d5883c9aa81ee10d61cbe4c2f2223dad9a50 (commit) from c7321a7b80aebeacb05ad5ab9d096779403b1758 (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 3849c3aec130601572b9e06b42bb6af5938936de Merge: 326c6a8 78adb71 Author: Dan McGee <dan@archlinux.org> Date: Mon Feb 20 17:00:26 2012 -0600 Merge branch 'maint' Conflicts: contrib/pacsysclean.in src/pacman/conf.h commit 326c6a8eed60bfd6aa0d653dad722d8637022d68 Author: Allan McRae <allan@archlinux.org> Date: Mon Feb 20 22:53:03 2012 +1000 Update copyright years Add 2012 to the copyright range for all libalpm and pacman source files. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 5bbe34293258c20afa636ca8f6546640af28678a Author: Allan McRae <allan@archlinux.org> Date: Sat Jul 9 21:52:01 2011 +1000 makepkg: rework libprovides This reworks the implmentation of libprovides for the following benefits: - Moves functionality from write_pkginfo() to find_libprovides() - Only calculates the version for libraries specifically requested and not all libraries. This has the disadvantage of running find over the $pkgdir for as many libraries as needed, but is unlikely to be an issue due to caching. - The order of the provides array in the PKGBUILD is kept in the package - There are more warning messages when things fail and those that were there are no longer errors (as I do not think failure of libprovides should result in complete packaging failure) - It is now modular so can be easy extended to other library types other than ELF *.so. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit f8892b9d087f5c60de663d107643085deaba727b Author: Dave Reisner <dreisner@archlinux.org> Date: Wed Feb 15 00:02:40 2012 -0500 util: reduce pointer hell in _alpm_makepath_mode Simplify the implementation: - allocate and manipulate a copy of the passed in path rather than building out a path as the while loop progresses - use simple pointer arithmetic to skip uninteresting cases - use mkdir(3)'s return value and errno to detect failure Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 31d95b867919b02774f4a98b25d2f997c2985600 Author: Nagy Gabor <ngaba@bibl.u-szeged.hu> Date: Thu Feb 9 04:14:06 2012 +0100 Print error message when to-be-downloaded file cannot be created It can happen that the to-be-downloaded file cannot be created in cachedir. For example, I am an -Sup user, and it is comfortable to set --cachedir to /mnt/pendrive, which is a FAT filesystem, so files like capseo-1:0.3-2-i686.pkg.tar.xz cannot be downloaded to there. Before this patch, pacman didn't give clear output about what happens when the download code could not create the necessary file. This can be confusing with -Su. An example output: *** $ sudo pacman -S capseo bochs --cachedir /c/TEMP resolving dependencies... looking for inter-conflicts... Targets (2): bochs-2.4.6-1 capseo-1:0.3-2 Total Download Size: 0.61 MiB Total Installed Size: 2.61 MiB Proceed with installation? [Y/n] :: Retrieving packages from extra... warning: failed to retrieve some files from extra bochs-2.4.6-1-i686 611.5 KiB 118K/s 00:05 [------------------] 97% error: failed to commit transaction (unexpected error) Errors occurred, no packages were upgraded. *** After the patch, pacman will give more informative error message (and pm_errno is set properly): *** error: could not open file '/c/TEMP/capseo-1:0.3-2-i686.pkg.tar.xz.part': Invalid argument error: failed to commit transaction (failed to retrieve some files) *** Unfortunately, the "could not open file" error message is printed for every mirror (that can be dozens of lines), which is ugly, but at least informative... Without modifying the download logic (for example, by introducing -2 return value for _alpm_download() to indicate giving up), this ugliness cannot be eliminated. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsysclean.in | 7 ++- doc/pacman.8.txt | 7 --- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 31 +----------- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 14 +++++- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 8 ++- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 55 +++++++++++---------- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/library/parse_options.sh | 32 ++++-------- scripts/makepkg.sh.in | 99 +++++++++++++++++++++---------------- scripts/pacman-key.sh.in | 6 +- scripts/pacman-optimize.sh.in | 3 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 3 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 10 +--- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 - src/pacman/upgrade.c | 2 +- src/pacman/util.c | 10 +++- test/pacman/tests/sync302.py | 8 ++-- test/pacman/tests/sync303.py | 3 - test/pacman/tests/sync304.py | 2 - test/pacman/tests/sync305.py | 3 - test/pacman/tests/sync306.py | 1 - test/pacman/tests/upgrade078.py | 17 +++---- 72 files changed, 200 insertions(+), 225 deletions(-) hooks/post-receive -- The official pacman repository