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 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a (commit) via 14e4366c781250092a5131b8fbbeda3aab67bd9d (commit) via 728b601f7b6df40b77bc5a4fc2dee5c1b1162fc4 (commit) from f35a5cf174ff6bc264cbd44110e9d595acc87947 (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 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a Author: Chantry Xavier <shiningxc@gmail.com> Date: Sat Jan 5 10:24:45 2008 +0100 conflict.c : fix for upgrade042. Thanks to the proactive backup handling, we don't need to add the moving file to the skip_add list. The backup handling will make sure nothing gets overwritten. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org> commit 14e4366c781250092a5131b8fbbeda3aab67bd9d Author: Dan McGee <dan@archlinux.org> Date: Sat Jan 5 16:37:55 2008 -0600 makepkg: add application/zip to the recognized types The recent upgrade of magic.mime in the file program changed the mime type output to application/zip instead of application/x-zip as it is a registered type. Unfortunately we then just skipped zip file extraction becuase of this change. Signed-off-by: Dan McGee <dan@archlinux.org> commit 728b601f7b6df40b77bc5a4fc2dee5c1b1162fc4 Author: Gustavo Chain <g@0xff.cl> Date: Sat Jan 5 15:35:30 2008 -0600 scripts: extra exit() calls in usage() function Remove the exit() calls from usage as they should be handled by the caller. Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/conflict.c | 24 +++++++----------------- pactest/tests/{upgrade042.py => upgrade043.py} | 4 ++-- scripts/gensync.sh.in | 1 - scripts/makepkg.sh.in | 2 +- scripts/updatesync.sh.in | 1 - 5 files changed, 10 insertions(+), 22 deletions(-) copy pactest/tests/{upgrade042.py => upgrade043.py} (87%) hooks/post-receive -- The official pacman repository