[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-131-gde5f438
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 de5f438aef1dd11c68658683996deab2b0714e0e (commit) via 73886504d7fa62e8cb49631fb13b53ea69919a3f (commit) via 93718046d79b58df4b90956d9fb4e2282071f62c (commit) via 0d5fa576b3ed011d091b87d84b79db794b37320c (commit) via 8aa7ed5a7e82eaa40c2ee68271226787710f8f08 (commit) via 6f37ba61ed79876b23d3328185186d9ac0c3332c (commit) via 42893e7165e3db0bf068611d5a4164926adcf43a (commit) via feb9889f22639c214606dcb387af6d0a51ea5e85 (commit) via 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (commit) from ef32aa0219146866b7f7e55c95afc327819dd6cf (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 de5f438aef1dd11c68658683996deab2b0714e0e Merge: 7388650 3a06a9f Author: Dan McGee <dan@archlinux.org> Date: Wed Oct 13 23:42:35 2010 -0500 Merge branch 'maint' commit 73886504d7fa62e8cb49631fb13b53ea69919a3f Author: Dan McGee <dan@archlinux.org> Date: Mon Oct 11 17:39:41 2010 -0500 Add several pactests for epoch code Signed-off-by: Dan McGee <dan@archlinux.org> commit 93718046d79b58df4b90956d9fb4e2282071f62c Author: Dan McGee <dan@archlinux.org> Date: Mon Oct 11 17:18:05 2010 -0500 Add epoch verification to makepkg If defined, it must be an integer. Signed-off-by: Dan McGee <dan@archlinux.org> commit 0d5fa576b3ed011d091b87d84b79db794b37320c Author: Dan McGee <dan@archlinux.org> Date: Fri Oct 8 08:59:02 2010 -0500 Update contrib/ for epoch Signed-off-by: Dan McGee <dan@archlinux.org> commit 8aa7ed5a7e82eaa40c2ee68271226787710f8f08 Author: Dan McGee <dan@archlinux.org> Date: Fri Oct 8 09:53:10 2010 -0500 Add epoch support to pactest This adds epoch support to pactest, while still producing packages and database entries the same way makepkg and repo-add currently do in a backward compatible fashion (still including the 'force' option). Signed-off-by: Dan McGee <dan@archlinux.org> commit 6f37ba61ed79876b23d3328185186d9ac0c3332c Author: Dan McGee <dan@archlinux.org> Date: Fri Oct 8 09:44:22 2010 -0500 Make repo-add and makepkg epoch-aware Allow it to be a variable in the PKGBUILD as well as propagating it through to the built package and the package database. We leave some backward compatibility in place by placing the '%FORCE%' option in the database if the package contains an epoch; this will be used by older versions of pacman and more or less ignored by versions that use epoch. Signed-off-by: Dan McGee <dan@archlinux.org> commit 42893e7165e3db0bf068611d5a4164926adcf43a Author: Dan McGee <dan@archlinux.org> Date: Fri Oct 8 08:52:14 2010 -0500 Update documentation to reflect new epoch package variable Signed-off-by: Dan McGee <dan@archlinux.org> commit feb9889f22639c214606dcb387af6d0a51ea5e85 Author: Dan McGee <dan@archlinux.org> Date: Fri Oct 8 08:39:23 2010 -0500 Add epoch support to pacman/libalpm This will allow for better control of what was previously the 'force' option in a PKGBUILD and transferred into the built package. Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 10 +++++++- contrib/bacman.in | 3 ++ doc/PKGBUILD.5.txt | 22 +++++++++++--------- doc/pacman.8.txt | 3 ++ lib/libalpm/alpm.h | 2 +- lib/libalpm/be_local.c | 22 ++++++++++++++----- lib/libalpm/be_package.c | 2 + lib/libalpm/be_sync.c | 11 +++++++++- lib/libalpm/package.c | 28 ++++++++++++++----------- lib/libalpm/package.h | 4 +- scripts/makepkg.sh.in | 11 ++++++--- scripts/repo-add.sh.in | 7 +++++- test/pacman/pmdb.py | 18 ++++++---------- test/pacman/pmpkg.py | 5 ++- test/pacman/tests/{sync136.py => sync140.py} | 8 ++---- test/pacman/tests/{sync137.py => sync141.py} | 5 +-- test/pacman/tests/sync142.py | 14 +++++++++++++ test/pacman/tests/sync143.py | 18 ++++++++++++++++ test/pacman/util.py | 4 +++ 19 files changed, 137 insertions(+), 60 deletions(-) copy test/pacman/tests/{sync136.py => sync140.py} (60%) copy test/pacman/tests/{sync137.py => sync141.py} (72%) create mode 100644 test/pacman/tests/sync142.py create mode 100644 test/pacman/tests/sync143.py hooks/post-receive -- The official pacman repository
participants (1)
-
dan@archlinux.org