- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Improve --help switch output for pacman utils
by Jason St. John 03 Sep '13

03 Sep '13

Unify the formatting of the --help switch for pacman utils, if it exists. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message The --help switch does not exist for a couple of the utils, so the help/usage text for those will be displayed when the util is run with no arguments. Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmit of a previous patch that has been rebased on the latest master. The original patch can be found on the ML here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-July/017647.html This patch partially addresses the issues raised by Karol Błażewicz in this email: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "cleanupdelta" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -87,9 +85,10 @@ static void checkdbs(alpm_list_t *dbnames) static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "cleanupdelta (pacman) v" PACKAGE_VERSION "\n\n" + "Returns a list of unused delta in a given sync database.\n\n" + "Usage: cleanupdelta [options]\n\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 7c551c2..687e558 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -343,9 +343,10 @@ static char escape_char(const char *string) static void usage(void) { - fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" + fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" - " -f, --files assume inputs are filepaths of packages\n" + " -f, --files assume inputs are file paths of packages\n" " -h, --help display this help message\n" " -k, --key <index> sort input starting on specified column\n" " -r, --reverse sort in reverse order (default: oldest to newest)\n" diff --git a/src/util/pactree.c b/src/util/pactree.c index 42c75aa..3d55d9f 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -310,9 +310,10 @@ static int parse_options(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "pactree v" PACKAGE_VERSION "\n" + fprintf(stderr, "pactree (pacman) v" PACKAGE_VERSION "\n\n" + "A simple dependency tree viewer.\n\n" "Usage: pactree [options] PACKAGE\n\n" - " -a, --ascii use ascii characters for tree formatting\n" + " -a, --ascii use ASCII characters for tree formatting\n" " -b, --dbpath <path> set an alternate database location\n" " -c, --color colorize output\n" " -d, --depth <#> limit the depth of recursion\n" @@ -320,7 +321,7 @@ static void usage(void) " -h, --help display this help message\n" " -l, --linear enable linear output\n" " -r, --reverse list packages that depend on the named package\n" - " -s, --sync search sync DBs instead of local\n" + " -s, --sync search sync databases instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" " --config <path> set an alternate configuration file\n"); } diff --git a/src/util/testdb.c b/src/util/testdb.c index 0ca7ffc..3d341b3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -27,8 +27,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "testdb" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -244,11 +242,11 @@ cleanup: static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] : check the local database\n", BASENAME); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "testdb (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman local database for validity.\n\n" + "Usage: testdb [options]\n\n" + " -b <pacman db> : check the local database\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 10b2f2c..d1b75ac 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -22,8 +22,6 @@ #include <alpm.h> -#define BASENAME "testpkg" - __attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { @@ -47,7 +45,9 @@ int main(int argc, char *argv[]) const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; if(argc != 2) { - fprintf(stderr, "usage: %s <package file>\n", BASENAME); + fprintf(stderr, "testpkg (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman package for validity.\n\n" + "Usage: testpkg <package file>\n"); return 1; } diff --git a/src/util/vercmp.c b/src/util/vercmp.c index f4356fb..41a4f8e 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -1,5 +1,6 @@ /* - * vercmp.c + * vercmp.c - Compare package version numbers using pacman's version + * comparison logic * * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2005 by Judd Vinet <jvinet(a)zeroflux.org> @@ -22,19 +23,19 @@ #include <stdio.h> /* printf */ #include <string.h> -#define BASENAME "vercmp" - /* forward declaration, comes from version.o in libalpm source that is linked * in directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); static void usage(void) { - fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); - fprintf(stderr, "output values:\n"); - fprintf(stderr, " < 0 : if ver1 < ver2\n"); - fprintf(stderr, " 0 : if ver1 == ver2\n"); - fprintf(stderr, " > 0 : if ver1 > ver2\n"); + fprintf(stderr, "vercmp (pacman) v" PACKAGE_VERSION "\n\n" + "Compare package version numbers using pacman's version comparison logic.\n\n" + "Usage: vercmp <ver1> <ver2>\n\n" + "Output values:\n" + " < 0 : if ver1 < ver2\n" + " 0 : if ver1 == ver2\n" + " > 0 : if ver1 > ver2\n"); } int main(int argc, char *argv[]) -- 1.8.4

1 0

[pacman-dev] [PATCH 1/2] makepkg: unify list of known hash algorithms
by Dave Reisner 03 Sep '13

03 Sep '13

Unifying this list makes adding new algorithms easier. There's also some menial cleanup in this patch to avoid use of eval and properly treat lists of data as array instead of simple strings. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 025f756..73f4eb7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -54,6 +54,8 @@ splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides +known_hash_algos=(md5 sha1 sha256 sha384 sha512) + # Options ASDEPS=0 NEEDED=0 @@ -1107,10 +1109,10 @@ get_integlist() { local integ local integlist=() - for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) - if [[ -n "$integrity_sums" ]]; then - integlist=(${integlist[@]} $integ) + for integ in "${known_hash_algos[@]}"; do + local sumname="${integ}sums[@]" + if [[ -n ${!sumname} ]]; then + integlist+=("$integ") fi done @@ -1131,19 +1133,17 @@ generate_checksums() { local integlist if (( $# == 0 )); then - integlist=$(get_integlist) + IFS=$'\n' read -ra integlist < <(get_integlist) else - integlist=$@ + integlist=("$@") fi local integ - for integ in ${integlist[@]}; do - case "$integ" in - md5|sha1|sha256|sha384|sha512) : ;; - *) - error "$(gettext "Invalid integrity algorithm '%s' specified.")" "$integ" - exit 1;; # $E_CONFIG_ERROR - esac + for integ in "${integlist[@]}"; do + if ! in_array "$integ" "${known_hash_algos[@]}"; then + error "$(gettext "Invalid integrity algorithm '%s' specified.")" "$integ" + exit 1 # $E_CONFIG_ERROR + fi local ct=0 local numsrc=${#source[@]} @@ -1192,8 +1192,9 @@ check_checksums() { local correlation=0 local integ required - for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) + for integ in "${known_hash_algos[@]}"; do + local sumname="${integ}sums[@]" + local integrity_sums=("${!sumname}") if (( ${#integrity_sums[@]} == ${#source[@]} )); then msg "$(gettext "Validating source files with %s...")" "${integ}sums" correlation=1 -- 1.8.4

3 3

[pacman-dev] [PATCH 0/3] Add "Usage" option for repos
by Dave Reisner 03 Sep '13

03 Sep '13

I've been using these patches for a while now (see the author date on the actual patches) and would like to present them again for feedback. I've found it tremendously useful (particularly as an Arch packager) to be able to keep an eye on other repos like [staging] without actually having them enabled. Dave Reisner (3): libalpm: introduce a usage level for repos pacman: add front end support for repo usage level pactree: set full usage on DBs when registering doc/pacman.conf.5.txt | 18 +++++++++++++++ lib/libalpm/alpm.h | 22 ++++++++++++++++++ lib/libalpm/be_local.c | 1 + lib/libalpm/be_sync.c | 4 ++++ lib/libalpm/db.c | 22 ++++++++++++++++++ lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 15 +++++++++++-- lib/libalpm/sync.c | 15 +++++++++++-- src/pacman/conf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/sync.c | 11 +++++++++ src/util/pactree.c | 3 ++- test/pacman/tests/sync051.py | 17 ++++++++++++++ test/pacman/tests/sync052.py | 14 ++++++++++++ 13 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/sync051.py create mode 100644 test/pacman/tests/sync052.py -- 1.8.3.4

3 7

[pacman-dev] [PATCH] makepkg.8: fix typo in usage
by Dave Reisner 21 Aug '13

21 Aug '13

Looks like I fat fingered something when I refactored the original submissions. Woops. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0b548bc..fcafb08 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -11,7 +11,7 @@ makepkg - package build utility Synopsis -------- -'makepkg' [options] [ENVVAR=value[ENVVAR+=value] ... +'makepkg' [options] [ENVVAR=value] [ENVVAR+=value] ... Description -- 1.8.3.4

1 0

[pacman-dev] [PATCH] alpm: log errors for scriptlets terminated by a signal
by Dave Reisner 21 Aug '13

21 Aug '13

Fixes FS#36618. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- We *could* print the signal name here as well, but signal value-to-name can actually vary by architecture so it's not clear that it's something we necessarily want to get into.... lib/libalpm/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f1f760a..4b708ff 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -599,6 +599,10 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) _alpm_log(handle, ALPM_LOG_ERROR, _("command failed to execute correctly\n")); retval = 1; } + } else if(WIFSIGNALED(status) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("command terminated by signal %d\n"), + WTERMSIG(status)); + retval = 1; } } -- 1.8.3.4

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-108-gce7456b
by allan＠archlinux.org 21 Aug '13

21 Aug '13

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 ce7456b4ccbe3ca7b06c9b50fe59ce7367172c4f (commit) via d8c2ab0e6f52d9a790b608c254761ab4888bd547 (commit) via 15b667ef36c1720e12160f2ca983f9783ddaf3e4 (commit) via 3d3c7ebb0dfef248c53f7cfc3730ed3fd89756a9 (commit) via 9085aa43224474bc2c943f4d268d8dd4b735a665 (commit) via 247b9af02bd0d40109cc0ca40116a960c9f530e7 (commit) from c02b16c4cc00f7b33aad79207c15fb651903e9ba (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 ce7456b4ccbe3ca7b06c9b50fe59ce7367172c4f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 12 21:09:01 2013 +1000 Store fgetc output as an int. Bug exposed on ARM when char is unsigned resulting in the comparison to EOF always failing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8c2ab0e6f52d9a790b608c254761ab4888bd547 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 9 09:15:40 2013 -0400 conflict.c: fix directory ownership check * append "/" to directories before searching package file lists * use lstat over stat so symlinks aren't resolved * fix the inverted check for stat's return value Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15b667ef36c1720e12160f2ca983f9783ddaf3e4 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Wed Aug 7 19:04:52 2013 +0200 doc/repo-add: Add note on when signatures are added to the db Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d3c7ebb0dfef248c53f7cfc3730ed3fd89756a9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 5 18:04:37 2013 -0400 makepkg: allow make-style environment var overrides This allows for VAR=value and VAR+=value variable declarations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9085aa43224474bc2c943f4d268d8dd4b735a665 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Aug 4 17:18:08 2013 -0400 check.c: break backup file search loop after match Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 247b9af02bd0d40109cc0ca40116a960c9f530e7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 15 14:14:46 2013 +1000 Do not refer to FlySpray numbers These references to bug numbers assume we will forever be using that bug tracker. It is better to properly comment the code instead (which was done in almost all cases anyway). Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 2 +- doc/repo-add.8.txt | 3 +++ lib/libalpm/add.c | 2 +- lib/libalpm/conflict.c | 16 ++++++++++++---- lib/libalpm/dload.c | 2 +- scripts/makepkg.sh.in | 17 ++++++++++++++++- src/pacman/check.c | 2 +- src/pacman/pacman.c | 4 +++- src/pacman/sync.c | 2 +- src/pacman/util.c | 4 ++-- .../tests/{fileconflict030.py => fileconflict031.py} | 11 +++++------ .../tests/{fileconflict030.py => fileconflict032.py} | 14 +++++++------- 12 files changed, 53 insertions(+), 26 deletions(-) copy test/pacman/tests/{fileconflict030.py => fileconflict031.py} (61%) copy test/pacman/tests/{fileconflict030.py => fileconflict032.py} (54%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-102-gc02b16c
by allan＠archlinux.org 21 Aug '13

21 Aug '13

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 c02b16c4cc00f7b33aad79207c15fb651903e9ba (commit) via 4d4f46ba2a9bb168f0e5f1139738c2cf4dc260ca (commit) via bf1c8e3a3c8d8becfb1f8c990d29ff459271b707 (commit) via 3d2c8e1fd0e2b1c74f82c6b2b667964768ea4cb0 (commit) via ab84249a58b0976c941860e48461956c57b67d10 (commit) via 26da037fd55040bcda834e2c95bf25e52f8a739e (commit) via 8287312c294b7e125cabe1bb0238156049a725cd (commit) via 36f702ba826f2d3bebb4df3232c1b2b64a03f8a5 (commit) via 74c8943682829329eaafa1e76482ca31877725fa (commit) from 12e00af5315135a29a66c9aaa01e141a32d4634b (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 c02b16c4cc00f7b33aad79207c15fb651903e9ba Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 2 08:29:03 2013 -0400 ini.c: give recursion limit file scope The recursion limit is an artificial limitation imposed to prevent memory exhaustion in a recursive function. Giving it file-level scope increases its visibility. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d4f46ba2a9bb168f0e5f1139738c2cf4dc260ca Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:53 2013 -0400 ini.c: make errors in includes fatal If an error in the main file would be fatal there is little reason to ignore the error in an included file. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf1c8e3a3c8d8becfb1f8c990d29ff459271b707 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:52 2013 -0400 ini.c: reuse line buffer By the time we make the recursive call we have already finished with the line buffer, making it safe to reuse. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d2c8e1fd0e2b1c74f82c6b2b667964768ea4cb0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:50 2013 -0400 conf.c: extract ini parsing code to separate files Move _parseconfig to ini.c as _parse_ini and create a convenient wrapper for the public API. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ab84249a58b0976c941860e48461956c57b67d10 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:49 2013 -0400 conf.c: pass _parse_directive as a callback This will allow passing arbitrary key/value handlers. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 26da037fd55040bcda834e2c95bf25e52f8a739e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:48 2013 -0400 conf.c: move section handling out of _parseconfig _parseconfig now tracks the current section name directly so that the name stored in the section struct is just a pointer to the one stored by _parseconfig. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8287312c294b7e125cabe1bb0238156049a725cd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:47 2013 -0400 conf.c: move directive parsing out of _parseconfig Include directives no longer have to be within a section. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36f702ba826f2d3bebb4df3232c1b2b64a03f8a5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:46 2013 -0400 conf.c: move repo parsing out of _parseconfig Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 74c8943682829329eaafa1e76482ca31877725fa Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 22 02:46:45 2013 -0400 conf.c: add parse_options to section_t This consolidates all of our state information into a single variable. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/Makefile.am | 1 + src/pacman/conf.c | 255 ++++++++--------------------- src/pacman/ini.c | 217 ++++++++++++++++++++++++ src/{common/util-common.h => pacman/ini.h} | 18 +- 4 files changed, 296 insertions(+), 195 deletions(-) create mode 100644 src/pacman/ini.c copy src/{common/util-common.h => pacman/ini.h} (68%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-93-g12e00af
by allan＠archlinux.org 21 Aug '13

21 Aug '13

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 12e00af5315135a29a66c9aaa01e141a32d4634b (commit) via 403c175dbc84a8198b92bbe76f66eade613cff48 (commit) via 228221003df40fa0782656d0e32d6ad072a4eec1 (commit) via 9263cc58747a1b2ed5a345e5b35014b44decd444 (commit) via 1152052b3e27e3252f6685a369fce8a426710015 (commit) via 429b956fb2d21309cae0560d6d98225969447737 (commit) via d3726bbd26769b1ab7cdbedda109db31bdfb0f78 (commit) via 2e2c614f0e35dfbf80c17d55377418c1ded3f065 (commit) from 48861f509a817649f6cbda63e5ed253bdebc4f56 (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 12e00af5315135a29a66c9aaa01e141a32d4634b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Aug 1 22:59:11 2013 -0400 pactest: remove results summary This functionality can be provided by a test harness. Having pactest output this information as well clutters the result log created by automake. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 403c175dbc84a8198b92bbe76f66eade613cff48 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 18 03:43:51 2013 -0400 integrate tests with automake Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 228221003df40fa0782656d0e32d6ad072a4eec1 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 29 15:34:04 2013 -0400 pactest: accept test names without a switch This removes the --test switch, making it easier to call pactest from a test harness. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9263cc58747a1b2ed5a345e5b35014b44decd444 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 29 14:57:59 2013 -0400 provide default values for test scripts Our test scripts currently require that the first argument be the library or binary to be tested. This makes integrating them with automake which doesn't have a mechanism for passing specific arguments to individual tests. Instead, provide a default built from paths in the environment which can be provided to all test scripts by automake. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1152052b3e27e3252f6685a369fce8a426710015 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jul 29 15:22:07 2013 -0400 convert pactest to TAP output Each test produces a single TAP result with the rules run in a sub-test. This reduces output when run under automake and makes it possible to continue setting expectfailure at the test level rather than per-rule. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 429b956fb2d21309cae0560d6d98225969447737 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Aug 1 22:51:24 2013 -0400 pactest: treat unknown rules as failures Tests should only be skipped when they aren't relevant, not when the test itself is bad. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d3726bbd26769b1ab7cdbedda109db31bdfb0f78 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 18 03:41:08 2013 -0400 convert test scripts to tap output Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e2c614f0e35dfbf80c17d55377418c1ded3f065 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Aug 18 15:06:30 2013 -0400 query006: only set expectfailure on 32-bit systems Use the architecture of the python interpreter running the test to detect 32bit systems. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 + Makefile.am | 36 +- build-aux/tap-driver.sh | 652 +++++++++++++++++++++++++++++++++++++ configure.ac | 1 + test/pacman/pactest.py | 29 +- test/pacman/pmdb.py | 5 +- test/pacman/pmenv.py | 87 +---- test/pacman/pmrule.py | 15 +- test/pacman/pmtest.py | 26 +- test/pacman/tap.py | 64 ++++ test/pacman/tests/TESTS | 288 ++++++++++++++++ test/pacman/tests/query006.py | 5 +- test/pacman/util.py | 4 +- test/scripts/human_to_size_test.sh | 29 +- test/scripts/parseopts_test.sh | 30 +- test/util/pacsorttest.sh | 41 +-- test/util/vercmptest.sh | 39 +-- 17 files changed, 1140 insertions(+), 213 deletions(-) create mode 100755 build-aux/tap-driver.sh create mode 100644 test/pacman/tap.py create mode 100644 test/pacman/tests/TESTS hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use file locks (flock) to stop multiple pacman instances from running concurrently. This improves the current model by automatically removing locks held by programs has failed to remove the lock, for example at a crash, forced kill or power outage.
by Mattias Andrée 19 Aug '13

19 Aug '13

This allows for further improvement of pacman where shared locks could also be used, in cases there pacman only reads the database and does not edit it. File locks also makes it easy to let pacman wait until the block instance has finished, by just not using the LOCK_NB flag. --- lib/libalpm/be_sync.c | 5 +---- lib/libalpm/handle.c | 26 ++++++++++++++------------ lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 7 +------ scripts/pacman-db-upgrade.sh.in | 9 +++++---- scripts/pacman-optimize.sh.in | 9 +++++---- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 0b99684..e7c8c4b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -284,10 +284,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) cleanup: - if(_alpm_handle_unlock(handle)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - handle->lockfile); - } + _alpm_handle_unlock(handle); free(syncpath); umask(oldmask); return ret; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..5d1cfb7 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -27,6 +27,7 @@ #include <sys/types.h> #include <syslog.h> #include <sys/stat.h> +#include <sys/file.h> #include <fcntl.h> /* libalpm */ @@ -44,6 +45,7 @@ alpm_handle_t *_alpm_handle_new(void) CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); handle->deltaratio = 0.0; + handle->lckstream = -1; return handle; } @@ -95,7 +97,7 @@ int _alpm_handle_lock(alpm_handle_t *handle) char *dir, *ptr; ASSERT(handle->lockfile != NULL, return -1); - ASSERT(handle->lckstream == NULL, return 0); + ASSERT(handle->lckstream < 0, return 0); /* create the dir of the lockfile first */ dir = strdup(handle->lockfile); @@ -110,14 +112,14 @@ int _alpm_handle_lock(alpm_handle_t *handle) FREE(dir); do { - fd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL, 0000); + fd = open(handle->lockfile, O_WRONLY | O_CREAT); } while(fd == -1 && errno == EINTR); if(fd >= 0) { - FILE *f = fdopen(fd, "w"); - fprintf(f, "%ld\n", (long)getpid()); - fflush(f); fsync(fd); - handle->lckstream = f; + if(flock(fd, LOCK_EX | LOCK_NB) < 0) { + return -1; + } + handle->lckstream = fd; return 0; } return -1; @@ -127,14 +129,14 @@ int _alpm_handle_lock(alpm_handle_t *handle) int _alpm_handle_unlock(alpm_handle_t *handle) { ASSERT(handle->lockfile != NULL, return -1); - ASSERT(handle->lckstream != NULL, return 0); - - fclose(handle->lckstream); - handle->lckstream = NULL; + ASSERT(handle->lckstream >= 0, return 0); - if(unlink(handle->lockfile) && errno != ENOENT) { - return -1; + flock(handle->lckstream, LOCK_UN); + if(flock(handle->lckstream, LOCK_EX | LOCK_NB) == 0) { + unlink(handle->lockfile); + flock(handle->lckstream, LOCK_UN); } + handle->lckstream = NULL; return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..7ca90ff 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -55,7 +55,7 @@ struct __alpm_handle_t { alpm_db_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ FILE *logstream; /* log file stream pointer */ - FILE *lckstream; /* lock file stream pointer if one exists */ + int lckstream; /* lock file file descriptor if one exists */ alpm_trans_t *trans; #ifdef HAVE_LIBCURL diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 8d4e0e7..122f35b 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -215,12 +215,7 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) /* unlock db */ if(!nolock_flag) { - if(_alpm_handle_unlock(handle)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - handle->lockfile); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: could not remove lock file %s\n", handle->lockfile); - } + _alpm_handle_unlock(handle); } return 0; diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c5..20cf035 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -102,12 +102,12 @@ dbroot="${dbroot%/}" # form the path to our lockfile location lockfile="${dbroot}/db.lck" -# make sure pacman isn't running -if [[ -f $lockfile ]]; then +# make sure pacman isn't running and stop other instances for starting +exec 100<>"$lockfile" +if ! flock -x --nonblock 100; then + flock --close 100 die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" fi -# do not let pacman run while we do this -touch "$lockfile" # pacman-3.4 to 3.5 upgrade - merge depends into desc if [[ $(find "$dbroot"/local -name depends) ]]; then @@ -123,5 +123,6 @@ fi # remove the lock file rm -f "$lockfile" +flock --close 100 # vim: set ts=2 sw=2 noet: diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47fbb49..8c6e556 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -114,12 +114,12 @@ dbroot="${dbroot%/}" lockfile="${dbroot}/db.lck" localdb="${dbroot}/local" -# make sure pacman isn't running -if [[ -f $lockfile ]]; then +# make sure pacman isn't running and stop other instances for starting +exec 100<>"$lockfile" +if ! flock -x --nonblock 100; then + flock --close 100 die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" fi -# do not let pacman run while we do this -touch "$lockfile" workdir=$(mktemp -d "${TMPDIR:-/tmp}/pacman-optimize.XXXXXXXXXX") || die_r "$(gettext "Can not create temp directory for database building.")\n" >&2 @@ -178,6 +178,7 @@ rm -rf "$localdb.old" # remove the lock file and our working directory with sums and tarfile rm -f "$lockfile" +flock --close 100 rm -rf "$workdir" echo -- 1.8.3.4

6 12

[pacman-dev] [PATCH 0/7] integrate test suite with automake
by Andrew Gregory 18 Aug '13

18 Aug '13

This patchset converts the output of all of our tests to tap [1] and fully integrates them with automake so that tests can be run in parallel with `make check`. The test suite may also be run with other test harnesses such as perl's prove which can do such interesting things as remember which tests failed and run only those on subsequent invocations. The documentation for integrating tests is here [2]. [1] http://podwiki.hexten.net/TAP/TAP.html?page=TAP [2] http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness… Andrew Gregory (7): convert test scripts to tap output pactest: treat unknown rules as failures convert pactest to TAP output provide default values for test scripts pactest: accept test names without a switch integrate tests with automake pactest: remove results summary .gitignore | 2 + Makefile.am | 36 +- build-aux/tap-driver.sh | 652 +++++++++++++++++++++++++++++++++++++ configure.ac | 1 + test/pacman/pactest.py | 29 +- test/pacman/pmdb.py | 5 +- test/pacman/pmenv.py | 87 +---- test/pacman/pmrule.py | 15 +- test/pacman/pmtest.py | 26 +- test/pacman/tap.py | 64 ++++ test/pacman/tests/TESTS | 288 ++++++++++++++++ test/pacman/util.py | 4 +- test/scripts/human_to_size_test.sh | 29 +- test/scripts/parseopts_test.sh | 30 +- test/util/pacsorttest.sh | 41 +-- test/util/vercmptest.sh | 39 +-- 16 files changed, 1136 insertions(+), 212 deletions(-) create mode 100755 build-aux/tap-driver.sh create mode 100644 test/pacman/tap.py create mode 100644 test/pacman/tests/TESTS -- 1.8.3.4

2 14