- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-228-gd73d055
by dan＠archlinux.org 09 Jun '10

09 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 d73d055c6fc194ce7b383308ed283ef3100ab26f (commit) via b8863622828287fc0ba204ce7270176753df6bd2 (commit) via ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 (commit) from 8163beb622733824d9e7baa884a574ac36ad3d8e (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 d73d055c6fc194ce7b383308ed283ef3100ab26f Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 16:48:50 2010 +1000 makepkg: use BUILDFILE rather than BUILDSCRIPT In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8863622828287fc0ba204ce7270176753df6bd2 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 15:31:30 2010 +1000 makepkg: fix errors with multiple install or changelog files Another issue caused by fe1e3471. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 9 13:45:22 2010 +1000 Fix creation of source packages Source packages were getting created with only links to local source files. Caused by commit 5cddcc90. Also, fix dangling symlinks to install and changelog files. Caused by commit fe1e3471. Thanks to Christopher Rogers <slaxemulator(a)gmail.com> for pointing out areas that were failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] [RFC] makepkg: add a test suite
by Allan McRae 09 Jun '10

09 Jun '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am getting annoyed at constantly missing bugs in makepkg patches! So, this is a really, really, really crappy attempt at getting a test suite up and going for makepkg. Essentially, stick a PKGBUILD in test/makepkg/tests and run test/makepkg/mptest. The test suite is controlled by an 'optional' mptest() function in the PKGBUILD. In that function you can define the following variables: files (array): A list of file necessary for the test to run. First entry is always the PKGBUILD. The syntax 'test001::PKGBUILD' can be used, tell the test suite to copy file 'test001' to 'PKGBUILD'. flags (string): Flags to pass to makepkg tests (array): Lists of tests to run files and tests have defaults (file to just copying the test file to 'PKGBUILD' and tests to running 'pkg_exists') The only tests available so far are: pkg_exists - checks all packages exist and have a .PKGINFO file pkg_has_file - checks a package has a file (not tested...) Needed tests: pkginfo - checks pkginfo file is correct Of course this needs a lot more structure and tests, but comments on the direction this is heading would be appreciated. All work on this is on my mptest branch. test/makepkg/mptest | 140 ++++++++++++++++++++++++++++++++++++++++++++ test/makepkg/tests/test001 | 7 ++ 2 files changed, 147 insertions(+), 0 deletions(-) create mode 100755 test/makepkg/mptest create mode 100644 test/makepkg/tests/test001 diff --git a/test/makepkg/mptest b/test/makepkg/mptest new file mode 100755 index 0000000..01e4b4a --- /dev/null +++ b/test/makepkg/mptest @@ -0,0 +1,140 @@ +#!/bin/bash + +splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ + 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ + 'backup' 'options' 'install' 'changelog') +readonly -a splitpkg_overrides + +backup_package_variables() { + for var in ${splitpkg_overrides[@]}; do + indirect="${var}_backup" + eval "${indirect}=(\"\${$var[@]}\")" + done +} + +restore_package_variables() { + for var in ${splitpkg_overrides[@]}; do + indirect="${var}_backup" + if [[ -n ${!indirect} ]]; then + eval "${var}=(\"\${$indirect[@]}\")" + else + unset ${var} + fi + done +} + +## +# Performs necessary PKGBUILD variable overrides for a given split-package +# +# Usage: pasre_splitpkg_overrides <pkgname> +## +parse_splitpkg_overrides() { + if grep -q "package_$1()" ${files[0]#*::}; then + backup_package_variables + pkgfunc=$(sed -n "/^package_$1/,/^}/p" ${files[0]#*::}) + for var in ${splitpkg_overrides[@]}; do + eval $(echo $pkgfunc | grep -Eo "$var=(\"[^)]*\"|$[^)]*$|[^ ]*)") + done + fi +} + +## +# Prepares for testing (including the running of makepkg) +## +prepare_test() { + # set default values + files=("$test::PKGBUILD") + flags="" + tests=('pkg_exists') + + # override defaults + if [[ $(type -t mptest) = "function" ]]; then + mptest + fi + + for file in ${files[@]}; do + cp ${file%%::*} ${testdir}/${file#*::} + done + + cd $testdir + ../../../../scripts/makepkg --config ../../../../etc/makepkg.conf $flags &> /dev/null + cd .. +} + +## +# Runs the requested tests +## +run_test() { + FAIL=0 + + cd $testdir + for i in ${tests[@]}; do + eval $i || FAIL=1 + done + cd .. + + return $FAIL +} + +## +# Checks if all package are created including PKGINFO presence +## +pkg_exists() { + for pkg in ${pkgname[@]}; do + parse_splitpkg_overrides $pkg + if [[ $arch != "any" ]]; then + arch=$CARCH + fi + if [[ ! -e $pkg-$pkgver-$pkgrel-$arch$PKGEXT ]] ;then + return 1 + fi + if ! bsdtar -tf $pkg-$pkgver-$pkgrel-$arch$PKGEXT -q .PKGINFO &> /dev/null; then + return 1 + fi + restore_package_variables + done + + return 0 +} + +## +# Checks for a file in a package +# +# Usage: pkg_has_file <pkgname> <file> +## +pkg_has_file() { + parse_splitpkg_overrides $1 + + if ! bsdtar -tf $pkg-$pkgver-$pkgrel-$arch$PKGEXT $2 &> /dev/null; then + return 1 + fi + restore_package_variables + + return 0 +} + + +## +# RUN THE TESTS! +## +cd tests + +for test in test*; do + source ../../../etc/makepkg.conf + source $test + + testdir=$(mktemp -d $test.XXXXXXXX) + if ! prepare_test; then + echo "FAIL: $test" + else + if ! run_test; then + echo "FAIL: $test" + else + echo "PASS: $test" + fi + fi + + # cleanup + unset mptest files flags tests + rm -rf $testdir +done \ No newline at end of file diff --git a/test/makepkg/tests/test001 b/test/makepkg/tests/test001 new file mode 100644 index 0000000..dfe6ec6 --- /dev/null +++ b/test/makepkg/tests/test001 @@ -0,0 +1,7 @@ +# test001: Minimal working PKGBUILD + +pkgname=NAME +pkgver=1 +pkgrel=1 +arch=('any') + -- 1.7.1

1 0

[pacman-dev] [PATCH] makepkg: use BUILDFILE rather than BUILDSCRIPT
by Allan McRae 09 Jun '10

09 Jun '10

In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- First error found by the future makepkg test suite! 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 8d6d1f6..b166f9d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1237,7 +1237,7 @@ check_sanity() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in ${!i}; do # evaluate any bash variables used @@ -1280,7 +1280,7 @@ check_sanity() { if [[ -n "${PKGLIST[@]}" ]]; then for pkg in ${PKGLIST[@]}; do if ! in_array $pkg ${pkgname[@]}; then - error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" + error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDFILE" return 1 fi done -- 1.7.1

1 1

[pacman-dev] [PATCH] makepkg: fix errors with multiple install or changelog files
by Allan McRae 09 Jun '10

09 Jun '10

Another issue caused by fe1e3471. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86984db..7785ff1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1106,9 +1106,9 @@ create_srcpackage() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") local file - for file in ${!i}; do + for file in $filelist; do # evaluate any bash variables used eval file=${file} if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then @@ -1237,9 +1237,9 @@ check_sanity() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") local file - for file in ${!i}; do + for file in $filelist; do # evaluate any bash variables used eval file=${file} if [[ ! -f $file ]]; then -- 1.7.1

1 0

[pacman-dev] [translation] Spanish translation (was: Current translation summary)
by Dan McGee 08 Jun '10

08 Jun '10

2010/6/7 Juan Pablo González T. <lord_jotape(a)yahoo.com.ar>: >> On Sun, Jun 6, 2010 at 9:40 AM, Dan McGee <dpmcgee(a)gmail.com> wrote: >> > 5 down, 14 to go. I'm impressed by how many languages we have these days. > I'm a little short of free time, but there's always a little time for pacman =) > the spanish translation for pacman and libalpm is attached. There are some broken translations in here, this one is missing a format specifier in the translation: (libalpm) #, c-format msgid "resuming download of %s not possible; starting over\n" msgstr "no es posible resumir la descarga; empezando de nuevo\n" And this one has the wrong number of format specifiers: (pacman) #, c-format msgid "" "config file %s, line %d: directive '%s' in repository section '%s' not " "recognized.\n" msgstr "" "archivo de configuración %s, línea %d: no fue reconocida la directiva '%s' " "en la sección repository.\n" -Dan

1 0

Re: [pacman-dev] [translation] Current translation summary
by Juan Pablo González T. 08 Jun '10

08 Jun '10

On Lun 07 Jun 2010 21:48:22 Dan McGee escribió: > 11 down, 8 to go is the latest update. If we could get these in by the > end of this week that would be awesome. > > Still to go: > > $ for f in po/*.po; do echo -n "$f: "; msgfmt -c --statistics $f > 2>&1; done | grep , > po/ca.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/es.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/nb_NO.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/pl.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/pt_BR.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/ro.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/sv_SE.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > po/uk.po: 389 translated messages, 41 fuzzy translations, 13 > untranslated messages. > > On Sun, Jun 6, 2010 at 9:40 AM, Dan McGee <dpmcgee(a)gmail.com> wrote: > > 5 down, 14 to go. I'm impressed by how many languages we have these days. I'm a little short of free time, but there's always a little time for pacman =) the spanish translation for pacman and libalpm is attached. Greetings

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-225-g8163beb
by dan＠archlinux.org 08 Jun '10

08 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 8163beb622733824d9e7baa884a574ac36ad3d8e (commit) from 88f139ab4ecb5242dc4682b49bb706413da976cc (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 8163beb622733824d9e7baa884a574ac36ad3d8e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 7 20:17:14 2010 -0500 Update English (British) translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/en_GB.po | 105 ++---------------- po/en_GB.po | 272 ++++++++++++++--------------------------------- 2 files changed, 89 insertions(+), 288 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [SCM] The official pacman repository branch, maint, created. v3.3.3-224-g88f139a
by dan＠archlinux.org 08 Jun '10

08 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 created at 88f139ab4ecb5242dc4682b49bb706413da976cc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

4 3

[pacman-dev] [SCM] The official pacman repository branch, master, updated. v3.3.3-224-g88f139a
by dan＠archlinux.org 07 Jun '10

07 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 88f139ab4ecb5242dc4682b49bb706413da976cc (commit) via b00d9113313479e37fc35a395a60bf25070b26b8 (commit) from 982018bf74ea42b423b44def7b289d819ae27ad9 (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: README | 33 ++++++ lib/libalpm/po/de.po | 63 ++--------- po/de.po | 291 +++++++++++++++----------------------------------- 3 files changed, 129 insertions(+), 258 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] API changes between 3.3 and 3.4
by Nagy Gabor 07 Jun '10

07 Jun '10

Updates for README file. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- README | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/README b/README index b9eb399..1276eaa 100644 --- a/README +++ b/README @@ -295,3 +295,36 @@ API CHANGES BETWEEN 3.2 AND 3.3 - error codes: PM_ERR_SERVER_NONE, PM_ERR_TRANS_NOT_LOCKED, PM_ERR_PKG_IGNORED and PM_ERR_LIBFETCH + + +API CHANGES BETWEEN 3.3 AND 3.4 +=============================== + +[REMOVED] +- pmtranstype_t struct (transaction type), alpm_trans_get_type() +- alpm_option_get_nopassiveftp(), alpm_option_set_nopassiveftp() + +[CHANGED] +- interface for target loading: + - alpm_trans_addtarget() and alpm_trans_sysupgrade() were removed + - alpm_sync_target() and alpm_sync_dbtarget() can be used to add a sync target + - alpm_sync_sysupgrade() can be used to add outdated packages (for sysupgrade) + - alpm_add_target() can be used to add an add/upgrade target + - alpm_remove_target() can be used to add a remove target +- interface for target listing: + - alpm_trans_get_pkgs() was removed + - alpm_pkg_get_removes() was removed + - alpm_trans_get_add() can be used to list add/upgrade/sync targets + - alpm_trans_get_remove() can be used to list to-be-removed packages +- the type parameter of alpm_trans_init() was removed +- the type of alpm_db_fetch callback function: mtimeold and mtimenew parameters + were replaced by force parameter +- unsigned short -> int changes for Boolean variables + +[ADDED] +- alpm_db_set_pkgreason() +- alpm_option_get_arch(), alpm_option_set_arch() +- alpm_option_get_usedelta() +- alpm_pkg_unused_deltas() +- alpm_conflict_get_reason() +- error code: PM_ERR_PKG_INVALID_ARCH -- 1.7.1

3 2