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 80b0f271254f965db4d94d6bb165c64ef3553588 (commit) via d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 (commit) via 507b01b912d77f0cc5422e689623f1b19c208525 (commit) via b6ccae2d182899eaf199e868963646b3a14f7e8b (commit) via dd82b8d09f554d709f92fcdc7f873cb551b2d205 (commit) via 6adf502f0d0e684c67d7498057083958becf8b19 (commit) via d26d50e664665905d79a3d5fa589b2ca0bec4ba0 (commit) from 2517ba3303489ed35512cdaf2493ec81efd145e7 (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 80b0f271254f965db4d94d6bb165c64ef3553588 Author: Dan McGee <dan@archlinux.org> Date: Mon Sep 26 17:31:34 2011 -0500 Ensure fileconflict value is actually a string When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan@archlinux.org> commit d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Sep 25 14:32:15 2011 -0400 bash_completion: add completion for pacman-key Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 507b01b912d77f0cc5422e689623f1b19c208525 Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Sep 25 15:24:53 2011 -0400 pacman-key: allow get_from to return a default value Keep the non-zero return val to let the caller know that the key wasn't found. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit b6ccae2d182899eaf199e868963646b3a14f7e8b Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Sep 25 14:34:36 2011 -0400 pacman-key: simplify writing to config file Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit dd82b8d09f554d709f92fcdc7f873cb551b2d205 Author: Allan McRae <allan@archlinux.org> Date: Sat Sep 24 15:08:21 2011 +1000 makepkg: normalize whitespace for optdepends in .PKGINFO Many PKGBUILDs use formatting whitespace when specifying optdepends. This is removed when adding a package to a repo-database so the output of "pacman -Si <package>" and "pacman -Qip <package file>" becomes inconsistent. Instead, do the adjustment when creating the .PKGINFO file. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 6adf502f0d0e684c67d7498057083958becf8b19 Author: Allan McRae <allan@archlinux.org> Date: Sat Sep 24 14:53:20 2011 +1000 makepkg: allow versioned optdepends with epoch Allow the specification of versioned optdepends with an epoch. This also (partially) enforces a whitespace between ":" and the description which is required for the future optdepends parsing code. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit d26d50e664665905d79a3d5fa589b2ca0bec4ba0 Author: Dan McGee <dan@archlinux.org> Date: Mon Sep 26 15:22:13 2011 -0500 Revamp pacman signal handler * All errors now go to stderr, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 16 +++++++++++++++ lib/libalpm/conflict.c | 30 +++++++++++++--------------- scripts/makepkg.sh.in | 6 ++-- scripts/pacman-key.sh.in | 14 ++++++------ src/pacman/pacman.c | 46 ++++++++++++++++++++++---------------------- 5 files changed, 63 insertions(+), 49 deletions(-) hooks/post-receive -- The official pacman repository