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 82d45d66ca36f48dd89867e817d198bd9e055829 (commit) via 5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b (commit) via ce74f76a4c923f9c13463189dedbdb04683b2142 (commit) via 76dfea6e83616f094b4d516e5139c2ffa2eaabff (commit) via 5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd (commit) via 96c4b1c3033e4f018ab20af5d35cf9cbd8b31cf4 (commit) via a42e52a09f8ccf25a46d7953b2e0a30f306ed223 (commit) via 6803260f2608b0a0028f5382c5a498d61bce45c3 (commit) via 40ea6cd607d5edb2699c084259b237d435313670 (commit) via 9d3d647f0031edd31fc7442f9d2cd9729718e41c (commit) via 5f38660be12c898e6ddef0d09b973d259d80c763 (commit) via 9d09c9fdf7f6156e81c28045e36970158f26d2f1 (commit) via 1d16875db7461a05eee456b39e815893c7aefd96 (commit) via 4885a7fa3a54e9a81831916c7925b2996b695f50 (commit) from 21240d4746be470b2cdabf106289034cbd27c579 (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 82d45d66ca36f48dd89867e817d198bd9e055829 Merge: 5c1b83d 4885a7f Author: Dan McGee <dan@archlinux.org> Date: Tue Aug 9 16:24:55 2011 -0500 Merge branch 'maint' Conflicts: src/pacman/callback.c commit 5c1b83d9b1e8c25e78fd9f24faf0f15b9a933c8b Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 23:54:46 2011 -0500 Parse replaces strings as dep strings with version specs This is done extremely crudely and is not very efficient, but it does push us down the path of being closer to right, as one additional test now passes. Signed-off-by: Dan McGee <dan@archlinux.org> commit ce74f76a4c923f9c13463189dedbdb04683b2142 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 23:25:45 2011 -0500 Conflict comparison performance enhancements * Add *_hash fields to conflict struct and populate them * Remove unnecessary backwards string comparisons Signed-off-by: Dan McGee <dan@archlinux.org> commit 76dfea6e83616f094b4d516e5139c2ffa2eaabff Author: Dan McGee <dan@archlinux.org> Date: Tue Aug 9 15:50:58 2011 -0500 Update string catalogs after string tweaks This also pulls in some early translations we had entered in Transifex in the last day so those would not be lost. The diffstat is huge and not very telling as usual, as all sorts of fuzzyness switches happened this time around for some reason. Signed-off-by: Dan McGee <dan@archlinux.org> commit 5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 23:52:52 2011 -0500 Add a slightly simpler versioned replace test It turns out we have a few problems here which are best tackled independently. The first is simply parsing replacements as dep strings; the second will be dealing with replaces when the original package name still exists in the repository. Signed-off-by: Dan McGee <dan@archlinux.org> commit 96c4b1c3033e4f018ab20af5d35cf9cbd8b31cf4 Author: Dan McGee <dan@archlinux.org> Date: Tue Aug 9 02:34:11 2011 -0500 Don't walk off front of string when stripping newline If the string was zero-length to begin with, or consists of only newline characters, nothing stopped us from incrementing right off the front of the string. Ensure len stays above zero the whole time. Signed-off-by: Dan McGee <dan@archlinux.org> commit a42e52a09f8ccf25a46d7953b2e0a30f306ed223 Author: Dan McGee <dan@archlinux.org> Date: Tue Aug 9 15:17:15 2011 -0500 doc/pacman.conf: make SigLevel overview an unordered list Signed-off-by: Dan McGee <dan@archlinux.org> commit 6803260f2608b0a0028f5382c5a498d61bce45c3 Author: Dan McGee <dan@archlinux.org> Date: Tue Aug 9 15:21:02 2011 -0500 Fix compile error when curl is not used Noticed in my PowerPC Linux VM: cc1: warnings being treated as errors dload.c:45: error: 'get_filename' defined but not used make[3]: *** [dload.lo] Error 1 Signed-off-by: Dan McGee <dan@archlinux.org> commit 40ea6cd607d5edb2699c084259b237d435313670 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 23:57:19 2011 -0500 Depend on name_hash being set This is a fairly valid assumption at this point, or at least as good of one as assuming packages all have names. Signed-off-by: Dan McGee <dan@archlinux.org> commit 9d3d647f0031edd31fc7442f9d2cd9729718e41c Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 23:32:19 2011 -0500 pactest: improve speed of local DB dependent rules We were doing some really silly stuff before and abusing the os.walk() call, having to walk the entire local database for every single PKG rule. We really only need top level directories, and we can cache any generated package since calls to db_read() are well-defined and only happen in one place. This speeds up the running of tests that may want to add 100 PKG_VERSION rules at once, where before we had to limit how many we used in order to not put a serious cramp in the speed of the test suite run. Signed-off-by: Dan McGee <dan@archlinux.org> commit 5f38660be12c898e6ddef0d09b973d259d80c763 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 19:55:44 2011 -0500 Add reason to corrupted package callback Signed-off-by: Dan McGee <dan@archlinux.org> commit 9d09c9fdf7f6156e81c28045e36970158f26d2f1 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 19:42:52 2011 -0500 Attempt to fix up some of the brokenness around failed package loads This is a bit of a mess, due to the fact that we have a progress meter running. It is also ironic that we are in the midst of a method named "commit" when we haven't done a damn thing yet, and can still fail hard if either a checksum or signature is invalid or unrecognized. Adapt the former test_md5sum method to be invoked for any of the various failure types, which at least gives the user some indication of what packages are failing. A second patch will be needed to actually show worthwhile error codes, but this is going to involve modifying the actual data passed with the callback. Signed-off-by: Dan McGee <dan@archlinux.org> commit 1d16875db7461a05eee456b39e815893c7aefd96 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 19:01:26 2011 -0500 Update several translation strings * Fix typos/capitalization * Make sure large blocks of text are translated in one unit Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 10 +- lib/libalpm/alpm.h | 3 + lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 34 +- lib/libalpm/deps.c | 3 +- lib/libalpm/dload.c | 6 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 3 +- lib/libalpm/po/ca.po | 60 +-- lib/libalpm/po/cs.po | 61 +-- lib/libalpm/po/da.po | 48 +- lib/libalpm/po/de.po | 60 +-- lib/libalpm/po/el.po | 60 +-- lib/libalpm/po/en_GB.po | 60 +-- lib/libalpm/po/es.po | 62 +-- lib/libalpm/po/fi.po | 55 +-- lib/libalpm/po/fr.po | 59 +-- lib/libalpm/po/hu.po | 59 +-- lib/libalpm/po/it.po | 61 +-- lib/libalpm/po/kk.po | 58 +-- lib/libalpm/po/libalpm.pot | 6 +- lib/libalpm/po/nb.po | 59 +-- lib/libalpm/po/pl.po | 59 +-- lib/libalpm/po/pt.po | 59 +-- lib/libalpm/po/pt_BR.po | 61 +-- lib/libalpm/po/ro.po | 64 +-- lib/libalpm/po/ru.po | 61 +-- lib/libalpm/po/sk.po | 60 +-- lib/libalpm/po/sr.po | 59 +-- lib/libalpm/po/sr@latin.po | 59 +-- lib/libalpm/po/sv.po | 44 +- lib/libalpm/po/tr.po | 60 +-- lib/libalpm/po/uk.po | 44 +- lib/libalpm/po/zh_CN.po | 61 +-- lib/libalpm/sync.c | 61 ++- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 20 +- scripts/pacman-key.sh.in | 10 +- scripts/po/ca.po | 378 ++++----------- scripts/po/cs.po | 383 +++++----------- scripts/po/da.po | 366 ++++----------- scripts/po/de.po | 372 ++++----------- scripts/po/el.po | 387 +++++----------- scripts/po/en_GB.po | 493 ++++++++------------ scripts/po/es.po | 384 ++++----------- scripts/po/fi.po | 382 ++++----------- scripts/po/fr.po | 386 ++++------------ scripts/po/hu.po | 380 ++++------------ scripts/po/it.po | 379 ++++----------- scripts/po/kk.po | 374 ++++----------- scripts/po/nb.po | 386 +++++----------- scripts/po/pacman-scripts.pot | 50 +-- scripts/po/pl.po | 381 +++++----------- scripts/po/pt.po | 383 ++++------------ scripts/po/pt_BR.po | 385 ++++------------ scripts/po/ro.po | 372 ++++----------- scripts/po/ru.po | 385 ++++------------ scripts/po/sk.po | 388 +++++----------- scripts/po/sr.po | 382 +++++----------- scripts/po/sr@latin.po | 383 +++++----------- scripts/po/sv.po | 362 ++++----------- scripts/po/tr.po | 379 ++++----------- scripts/po/uk.po | 350 ++++----------- scripts/po/zh_CN.po | 388 +++++----------- scripts/repo-add.sh.in | 2 +- src/pacman/callback.c | 31 +- src/pacman/po/ca.po | 98 ++--- src/pacman/po/cs.po | 99 ++--- src/pacman/po/da.po | 91 ++-- src/pacman/po/de.po | 125 +++--- src/pacman/po/el.po | 97 ++-- src/pacman/po/en_GB.po | 122 +++--- src/pacman/po/es.po | 100 ++--- src/pacman/po/fi.po | 96 ++-- src/pacman/po/fr.po | 99 ++--- src/pacman/po/hu.po | 97 ++--- src/pacman/po/it.po | 98 ++--- src/pacman/po/kk.po | 96 ++--- src/pacman/po/nb.po | 96 ++-- src/pacman/po/pacman.pot | 6 +- src/pacman/po/pl.po | 97 ++--- src/pacman/po/pt.po | 98 ++-- src/pacman/po/pt_BR.po | 102 ++--- src/pacman/po/ro.po | 100 ++--- src/pacman/po/ru.po | 100 ++--- src/pacman/po/sk.po | 96 ++-- src/pacman/po/sr.po | 97 ++-- src/pacman/po/sr@latin.po | 96 ++-- src/pacman/po/sv.po | 87 ++-- src/pacman/po/tr.po | 98 ++--- src/pacman/po/uk.po | 87 ++-- src/pacman/po/zh_CN.po | 97 ++--- src/pacman/sync.c | 4 +- test/pacman/pmdb.py | 26 +- test/pacman/tests/replace101.py | 9 +- test/pacman/tests/replace102.py | 38 +- test/pacman/tests/{replace102.py => replace110.py} | 0 97 files changed, 4523 insertions(+), 9315 deletions(-) copy test/pacman/tests/{replace102.py => replace110.py} (100%) hooks/post-receive -- The official pacman repository