June 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add check() function for testsuites.
by Jeff 22 Jun '10

22 Jun '10

If this is an accepted feature, I can resend the patch with manpage updates. Signed-off-by: Jeff C <jeff(a)kcaccess.com> --- etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..b3c4b4c 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -58,7 +58,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !check) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries in STRIP_DIRS @@ -67,8 +67,9 @@ BUILDENV=(fakeroot !distcc color !ccache) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- check: Run the check() function if it exists. # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !check) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 678359f..2a659e6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,7 @@ startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'check') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST="" @@ -143,6 +144,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -735,7 +739,11 @@ run_function() { fi msg "$(gettext "Starting %s()...")" "$pkgfunc" - cd "$srcdir" + if [[ -d "$srcdir"/"$pkgname"-"$pkgver" ]]; then + cd "$srcdir"/"$pkgname"-"$pkgver" + else + cd "$srcdir" + fi # ensure all necessary build variables are exported export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST @@ -798,6 +806,10 @@ run_build() { run_function "build" } +run_check() { + [[ $(check_option check) = "y" ]] && run_function "check" +} + run_package() { if [[ -z $1 ]]; then pkgfunc="package" @@ -1772,6 +1784,9 @@ fi if [[ $(type -t build) = "function" ]]; then BUILDFUNC=1 fi +if [[ $(type -t check) = "function" ]]; then + CHECKFUNC=1 +fi if [[ $(type -t package) = "function" ]]; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 && $(type -t package_${pkgname}) = "function" ]]; then @@ -1835,6 +1850,9 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + if (( CHECKFUNC )); then + run_check + fi tidy_install fi else @@ -1960,6 +1978,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -1991,6 +2010,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.1

2 3

[pacman-dev] [PATCH 1/2] makepkg: fix regression in split package function checking
by Andres P 21 Jun '10

21 Jun '10

Commit 13748ca0529 inversed the nature of one test wherein the if clause would throw a fatal error if a legitimate package function was defined in PKGBUILD. Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dbc4047..f2ec78e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1255,7 +1255,7 @@ check_sanity() { if (( ${#pkgname[@]} > 1 )); then for pkg in ${pkgname[@]}; do - if declare -f package_${pkg} >/dev/null; then + if ! declare -f package_${pkg} >/dev/null; then error "$(gettext "missing package function for split package '%s'")" "$pkg" return 1 fi -- 1.7.1

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-21-g67d71ea
by dan＠archlinux.org 21 Jun '10

21 Jun '10

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 67d71ea932a18d27dbb87f4f364ae9159b4edc96 (commit) via c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 (commit) via 6c00ca8f234cfcbfde7e36b68d85f9dcab5716c8 (commit) via 7fc50d79508f30e74e5ea8d9c801549e7f52229d (commit) via dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 (commit) from 59c47aaf529df02ec1577fe727c3c84d13592666 (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 67d71ea932a18d27dbb87f4f364ae9159b4edc96 Merge: 59c47aa c2cf6a1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 20 21:01:32 2010 -0500 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +++--- lib/libalpm/sync.c | 6 +++++- scripts/makepkg.sh.in | 10 +++++----- test/pacman/tests/ignore006.py | 10 ++++++++++ 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 test/pacman/tests/ignore006.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-4-gc2cf6a1
by dan＠archlinux.org 21 Jun '10

21 Jun '10

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, maint has been updated via c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 (commit) via 6c00ca8f234cfcbfde7e36b68d85f9dcab5716c8 (commit) from 7fc50d79508f30e74e5ea8d9c801549e7f52229d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 6 +++++- scripts/makepkg.sh.in | 10 +++++----- test/pacman/tests/ignore006.py | 10 ++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 test/pacman/tests/ignore006.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Handle sync target + ignore properly
by Dan McGee 21 Jun '10

21 Jun '10

Rather than say we can't find the target after saying "No, I guess I don't want to install this", we should make sure the ignored status gets passed all the way through. This fixes FS#19866. Pactest is also included that failed before due to the fact that we normally treat an unfound package as a reason to exit with a non-zero status. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Candidate for maint, it should be pretty straightforward. -Dan lib/libalpm/sync.c | 6 +++++- test/pacman/tests/ignore006.py | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) create mode 100644 test/pacman/tests/ignore006.py diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 67afd39..68ee8dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -291,7 +291,11 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target) } if(!found) { - RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + /* pass through any 'found but ignored' errors */ + if(pm_errno != PM_ERR_PKG_IGNORED) { + pm_errno = PM_ERR_PKG_NOT_FOUND; + } + return(-1); } return(0); diff --git a/test/pacman/tests/ignore006.py b/test/pacman/tests/ignore006.py new file mode 100644 index 0000000..4c1c1ca --- /dev/null +++ b/test/pacman/tests/ignore006.py @@ -0,0 +1,10 @@ +self.description = "Sync with target in ignore list and say no" + +pkg = pmpkg("package1") +self.addpkg2db("sync", pkg) + +self.option["IgnorePkg"] = ["package1"] +self.args = "--ask=1 -S %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=package1") -- 1.7.1

2 1

[pacman-dev] [PATCH] makepkg: revert bash4-ism
by Allan McRae 21 Jun '10

21 Jun '10

Commit 3d67d9b1 introduced a bash4 string manipulation. Revert that in order retain compatibility with bash-3.2 which is still widely used. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is for the maint branch scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c6bc738..3bc6019 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1665,7 +1665,7 @@ if (( CLEANCACHE )); then echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer - answer="${answer^^}" + answer=$(echo $answer | tr '[:lower:]' '[:upper:]') if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then rm "$SRCDEST"/* if (( $? )); then -- 1.7.1

3 7

[pacman-dev] [PATCH] makepkg: remove bash4 style output redirection
by Allan McRae 21 Jun '10

21 Jun '10

convert bash-4 "&>" style redirection to "2>&1" to maintain compatibility with bash-3.2 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 126c5f5..8e2a523 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -370,7 +370,7 @@ download_file() { run_pacman() { local ret=0 if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then - if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + if [ "$(type -p sudo)" ] && sudo -l $PACMAN >/dev/null 2>&1; then sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? else su -c "$PACMAN $PACMAN_OPTS $*" || ret=$? @@ -421,7 +421,7 @@ handle_deps() { # avoid triggering the ERR trap local restoretrap=$(trap -p ERR) trap - ERR - source /etc/profile &>/dev/null + source /etc/profile >/dev/null 2>&1 eval $restoretrap return $R_DEPS_SATISFIED @@ -479,7 +479,7 @@ remove_deps() { download_sources() { msg "$(gettext "Retrieving Sources...")" - pushd "$SRCDEST" &>/dev/null + pushd "$SRCDEST" >/dev/null 2>&1 local netfile for netfile in "${source[@]}"; do @@ -515,7 +515,7 @@ download_sources() { ln -s "$SRCDEST/$file" "$srcdir/" done - popd &>/dev/null + popd >/dev/null 2>&1 } get_integlist() { @@ -976,7 +976,7 @@ check_package() { done # check for references to the build directory - if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then + if grep -R "${srcdir}" "${pkgdir}" >/dev/null 2>&1; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi } -- 1.7.1

5 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-16-g59c47aa
by dan＠archlinux.org 21 Jun '10

21 Jun '10

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 59c47aaf529df02ec1577fe727c3c84d13592666 (commit) via d7dccd541962f0dd8bf323ae11633e595bfb4922 (commit) via 3e4d2c3aa65416487939148828afb385de2ee146 (commit) via f5f107674bd34b281681d73a32e4dde1f9d0856f (commit) via 1b93a116e73050d2a037843647b961432b2a0dc8 (commit) via 70418e48f6c0033a1bf942fec0bbc001d3d0d8f5 (commit) via c7a37d039bc4361077fdf77180b35b81bd8b12a7 (commit) via cd042640c66e73f3fe4f5299a36e4cca5384b34b (commit) via 13748ca052975cbf6354cfc4554f49a3d8ff46fe (commit) via 34229c562571d458446c9e4da197fcae251c2f6b (commit) from 09aae4b7a5891ad738754a22f956c83911d1d9eb (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 59c47aaf529df02ec1577fe727c3c84d13592666 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 19 18:55:08 2010 +1000 Clarify testing within conditional statements Follow the HACKING guidelines and always use != 0 or == 0 rather than negation within conditional statements to improve clarity. Most of these are !strcmp usages which is the example of what not to do in the HACKING document. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d7dccd541962f0dd8bf323ae11633e595bfb4922 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 18 19:21:10 2010 -0430 makepkg: remove unnecessary use of sort pacman -Qq output is sorted according to the users LC_COLLATE setting as is needed for comm. Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: adjust commit message] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e4d2c3aa65416487939148828afb385de2ee146 Author: Andres P <aepd87(a)gmail.com> Date: Sat Jun 19 01:25:15 2010 -0430 libalpm: compare pkgname with strcoll Use strcoll to compare package names to provide output sorted according to a users LC_COLLATE settings. Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: added commit message] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f5f107674bd34b281681d73a32e4dde1f9d0856f Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 18 19:21:09 2010 -0430 makepkg: use parameter expansion instead of basename Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1b93a116e73050d2a037843647b961432b2a0dc8 Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:51 2010 -0430 makepkg: fix inconsistent output when checking dependencies Instead of writing: ==> Checking Runtime Dependencies... ==> Checking Buildtime Dependencies... ==> Installing missing dependencies... Just make it homogeneous: ==> Checking runtime dependencies... ==> Checking buildtime dependencies... ==> Installing missing dependencies... Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 70418e48f6c0033a1bf942fec0bbc001d3d0d8f5 Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:49 2010 -0430 makepkg: merge in-line splitpkg handling logic Ease maintainace; the two parts that have been combined into a function were identical. Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: rename function] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c7a37d039bc4361077fdf77180b35b81bd8b12a7 Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:48 2010 -0430 makepkg: add to variables without expanding them Use foo+=" bar" instead of foo="${foo} bar" Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd042640c66e73f3fe4f5299a36e4cca5384b34b Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:46 2010 -0430 makepkg: less code repetition for empty variable checking Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 13748ca052975cbf6354cfc4554f49a3d8ff46fe Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:42 2010 -0430 makepkg: use "declare -f" to test for function presence Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 34229c562571d458446c9e4da197fcae251c2f6b Author: Andres P <aepd87(a)gmail.com> Date: Thu Jun 17 08:14:41 2010 -0430 makepkg: fix variable checks when writing pkginfo Regression caused by c71fe7db. Was checking for "optdepend" and "conflict" rather than "optdepends" and "conflicts" when populating .PKGINFO. Signed-off-by: Andres P <aepd87(a)gmail.com> [Allan: adjust commit message] Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 34 +++++++------- lib/libalpm/conflict.c | 4 +- lib/libalpm/deps.c | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/trans.c | 4 +- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 107 ++++++++++++++++++++------------------------- src/pacman/callback.c | 2 +- src/pacman/package.c | 2 +- src/pacman/sync.c | 8 ++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 6 +- src/util/testdb.c | 2 +- 13 files changed, 83 insertions(+), 94 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Move gpg pactests to new location
by Allan McRae 20 Jun '10

20 Jun '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- For the gpg branch. Could be rebased into earlier commits... {pactest => test/pacman}/tests/sign001.py | 0 {pactest => test/pacman}/tests/sign002.py | 0 {pactest => test/pacman}/tests/smoke002.py | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {pactest => test/pacman}/tests/sign001.py (100%) rename {pactest => test/pacman}/tests/sign002.py (100%) rename {pactest => test/pacman}/tests/smoke002.py (100%) diff --git a/pactest/tests/sign001.py b/test/pacman/tests/sign001.py similarity index 100% rename from pactest/tests/sign001.py rename to test/pacman/tests/sign001.py diff --git a/pactest/tests/sign002.py b/test/pacman/tests/sign002.py similarity index 100% rename from pactest/tests/sign002.py rename to test/pacman/tests/sign002.py diff --git a/pactest/tests/smoke002.py b/test/pacman/tests/smoke002.py similarity index 100% rename from pactest/tests/smoke002.py rename to test/pacman/tests/smoke002.py -- 1.7.1

2 1

[pacman-dev] [PATCH 15/15] makepkg: remove unnecessary use of sort(1)
by Andres P 20 Jun '10

20 Jun '10

pacman -Qq output is always sorted! $ diff -s <(pacman -Qq) <(pacman -Qq | sort) Files /dev/fd/63 and /dev/fd/62 are identical Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29b5664..e78bcb1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1872,7 +1872,7 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then fi elif type -p "${PACMAN%% *}" >/dev/null; then if (( RMDEPS )); then - original_pkglist=($(run_pacman -Qq | sort)) # required by remove_dep + original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi deperr=0 @@ -1883,7 +1883,7 @@ elif type -p "${PACMAN%% *}" >/dev/null; then resolve_deps ${makedepends[@]} || deperr=1 if (( RMDEPS )); then - current_pkglist=($(run_pacman -Qq | sort)) # required by remove_deps + current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi if (( deperr )); then -- 1.7.1

2 6