May 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Clarify that -Ql prints a file list
by Allan McRae 25 May '14

25 May '14

FS#40234 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ef86d39..2f0fc2c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -139,7 +139,7 @@ static void usage(int op, const char * const myname) addlist(_(" -g, --groups view all members of a package group\n")); addlist(_(" -i, --info view package information (-ii for backup files)\n")); addlist(_(" -k, --check check that package files exist (-kk for file properties)\n")); - addlist(_(" -l, --list list the contents of the queried package\n")); + addlist(_(" -l, --list list the files owned by the queried package\n")); addlist(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); addlist(_(" -n, --native list installed packages only found in sync db(s) [filter]\n")); addlist(_(" -o, --owns <file> query the package that owns <file>\n")); -- 1.9.3

1 0

[pacman-dev] [PATCH] makepkg: pass "--nocolor" to pacman
by Allan McRae 25 May '14

25 May '14

From: Andrew DeMaria <lostonamountain(a)gmail.com> FS#39982. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index de92e93..ac97c5b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2718,7 +2718,7 @@ while true; do -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n' ;; + -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=" --color never" ;; --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; -- 1.9.3

1 0

[pacman-dev] [PATCH] makepkg: Force buildscripts to be in startdir
by Allan McRae 25 May '14

25 May '14

We expect all source file to lie in $startdir. However, using "makepkg -p <buildscript>" can currently allows people to specify buildscripts in other directories. This results in confusion about where other sources should lie (in startdir or in the directory that the buildscript is in). Explicitly disable using -p for files in other directories to avoid this issue. Fixes FS#40293. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 3 ++- scripts/makepkg.sh.in | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 9547bc8..0277f54 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -116,7 +116,8 @@ Options *-p* <buildscript>:: Read the package script `buildscript` instead of the `PKGBUILD` default; - see linkman:PKGBUILD[5]. + see linkman:PKGBUILD[5]. The `buildscript` must be located in the directory + makepkg is called from. *-r, \--rmdeps*:: Upon successful build, remove any dependencies installed by makepkg diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 96e5349..de92e93 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2906,6 +2906,11 @@ else exit 1 fi + if [[ ${BUILDFILE##*/} != "${BUILDFILE}" && ${BUILDFILE} != "${startdir}/${BUILDFILE##*/}" ]]; then + error "$(gettext "%s must be in the build directory.")" "$BUILDFILE" + exit 1 + fi + if [[ ${BUILDFILE:0:1} != "/" ]]; then BUILDFILE="$startdir/$BUILDFILE" fi -- 1.9.3

1 0

[pacman-dev] [PATCHv3 1/3] makepkg: Use read to parse status file during signature verification.
by Thomas Bächler 23 May '14

23 May '14

Instead of invoking grep multiple times, parse the status file once. This refactoring also changes the behvaiour when signature verification fails due to a missing public key: It is now an error instead of a warning. --- scripts/makepkg.sh.in | 92 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d8cdc88..7eeeaba 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1244,13 +1244,56 @@ check_checksums() { fi } +parse_gpg_statusfile() { + local type arg1 arg6 + + while read -r _ type arg1 _ _ _ _ arg6 _; do + case "$type" in + GOODSIG) + pubkey=$arg1 + success=1 + status="good" + ;; + EXPSIG) + pubkey=$arg1 + success=1 + status="expired" + ;; + EXPKEYSIG) + pubkey=$arg1 + success=1 + status="expiredkey" + ;; + REVKEYSIG) + pubkey=$arg1 + success=0 + status="revokedkey" + ;; + BADSIG) + pubkey=$arg1 + success=0 + status="bad" + ;; + ERRSIG) + pubkey=$arg1 + success=0 + if [[ $arg6 == 9 ]]; then + status="missingkey" + else + status="error" + fi + ;; + esac + done < "$1" +} + check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 msg "$(gettext "Verifying source file signatures with %s...")" "gpg" - local file pubkey ext decompress found + local file ext decompress found pubkey success status local warning=0 local errors=0 local statusfile=$(mktemp) @@ -1292,31 +1335,42 @@ check_pgpsigs() { "") decompress="cat" ;; esac - if ! $decompress < "$sourcefile" | gpg --quiet --batch --status-file "$statusfile" --verify "$file" - 2> /dev/null; then + $decompress < "$sourcefile" | gpg --quiet --batch --status-file "$statusfile" --verify "$file" - 2> /dev/null + success=0 + status= + pubkey= + parse_gpg_statusfile "$statusfile" + if (( ! $success )); then printf '%s' "$(gettext "FAILED")" >&2 - if ! pubkey=$(awk '/NO_PUBKEY/ { print $3; exit 1; }' "$statusfile"); then - printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 - warnings=1 - else - errors=1 - fi - printf '\n' >&2 + case "$status" in + "missingkey") + printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 + ;; + "revokedkey") + printf " ($(gettext "public key %s has been revoked"))" "$pubkey" >&2 + ;; + "bad") + printf ' (%s)' "$(gettext "bad signature from public key") $pubkey" >&2 + ;; + "error") + printf ' (%s)' "$(gettext "error during signature verification")" >&2 + ;; + esac + errors=1 else - if grep -q "REVKEYSIG" "$statusfile"; then - printf '%s (%s)' "$(gettext "FAILED")" "$(gettext "the key has been revoked.")" >&2 - errors=1 - else - printf '%s' "$(gettext "Passed")" >&2 - if grep -q "EXPSIG" "$statusfile"; then + printf '%s' "$(gettext "Passed")" >&2 + case "$status" in + "expired") printf ' (%s)' "$(gettext "WARNING:") $(gettext "the signature has expired.")" >&2 warnings=1 - elif grep -q "EXPKEYSIG" "$statusfile"; then + ;; + "expiredkey") printf ' (%s)' "$(gettext "WARNING:") $(gettext "the key has expired.")" >&2 warnings=1 - fi - fi - printf '\n' >&2 + ;; + esac fi + printf '\n' >&2 done rm -f "$statusfile" -- 1.9.2

3 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-348-gec01a22
by allan＠archlinux.org 23 May '14

23 May '14

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 ec01a22f7d13147a52ac8c0c1ee1b5fc2426de39 (commit) via d39d3b3a0997a997af48e4446e4b97c53be2439d (commit) via d174cc8943344a14330c8dce20941de303a44927 (commit) via 34ae6ce4e5a47b11b7fa55b94bc476f294b004bc (commit) via 7a5e41925f72d838eaa611427e5ae89b1f57215f (commit) via b929e74f2ebc1b7102d57cd22a5e986cead5bd4b (commit) via 060d06d2f7f93ebc2d3af6a0846f06b2f7d38c3a (commit) via 00fbdabc55c1de28f65eef27cb6448608c3d4e1f (commit) via 80d3709e65e9ee778f6a26235516b990290b49e0 (commit) via dd694f433b0848a04ae72e771086b1bcd8b9a4e9 (commit) via 5293d5784049869c965ee21f424b8845bdebb745 (commit) via 6103183253f16edf32fb5c01a288a80a50092d88 (commit) via d8b09e6656070f8c2551e3e0f75e40b3c2a669db (commit) via ee72c016ab316aaca3781d2c45bf0de77fefcf3c (commit) via d8f0c3e5b983910dcaef3091ea622ebc3be0f5a0 (commit) via b26432dbdbe7afdaa0743f6509cc69e1c7007981 (commit) via b0dc547fcbc3e4b0116f8982d500635ebdeb506c (commit) via fb8437b588356f2efd9dd093a304edc3a1859a1d (commit) via fcf0cefd1a9ae9bd3319c82a77ed38d7a2bc8db3 (commit) via 3ebb7b94d92cbdbf3f03ba8f13e15df7dca26e20 (commit) from 912ea363dec9038e9226a619364e16709720cac3 (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 ec01a22f7d13147a52ac8c0c1ee1b5fc2426de39 Author: Allan McRae <allan(a)archlinux.org> Date: Fri May 23 16:02:18 2014 +1000 Do not check makepkg-wrapper for standard options Fixes "make distcheck". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d39d3b3a0997a997af48e4446e4b97c53be2439d Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sun May 4 10:31:00 2014 +0200 makepkg: Introduce validpgpkeys array If validpgpkeys is set in the PKGBUILD, signature checking fails if the fingerprint of the key used to create the signature is not listed in the array. The key's trust value is ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d174cc8943344a14330c8dce20941de303a44927 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sun May 4 10:30:59 2014 +0200 makepkg: Treat a signature from an untrusted key as an error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 34ae6ce4e5a47b11b7fa55b94bc476f294b004bc Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sun May 4 10:30:58 2014 +0200 makepkg: Use read to parse status file during signature verification. Instead of invoking grep multiple times, parse the status file once. This refactoring also changes the behvaiour when signature verification fails due to a missing public key: It is now an error instead of a warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a5e41925f72d838eaa611427e5ae89b1f57215f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri May 9 19:55:41 2014 -0400 dload: avoid using CURLOPT_FAILONERROR Use of this flag causes connections to be closed on 404s -- a common occurrence when your config sets DatabaseOptional. Handle the error gracefully, so that the connection can be reused. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b929e74f2ebc1b7102d57cd22a5e986cead5bd4b Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun May 11 21:30:31 2014 +0200 util: Use off_t instead of int for size values Old output: > Total Installed Size: -1527.44 MiB Fixed: > Total Installed Size: 2568.56 MiB Bug introduced in 7b8f8753b15037bf4a88126ffde8195416432c72. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 060d06d2f7f93ebc2d3af6a0846f06b2f7d38c3a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon May 5 22:34:15 2014 -0400 remove.c: downgrade TRANS_DUP_TARGET to warning Matches the behavior for sync packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 00fbdabc55c1de28f65eef27cb6448608c3d4e1f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 6 19:20:55 2014 -0400 pactest: treat arguments as files instead of globs glob() returns an empty list if input does not match any files, causing non-existent test files to be silently skipped. Treating arguments as files causes pactest to immediately bail out with an appropriate error message on non-existent files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80d3709e65e9ee778f6a26235516b990290b49e0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 19:22:25 2014 -0400 pmdb.py: change siglevel name to Required "Always" is not a valid siglevel. sign002.py was succeeding because pacman failed to parse the resulting config file rather than a failed signature check. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dd694f433b0848a04ae72e771086b1bcd8b9a4e9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 19:24:55 2014 -0400 register_syncdb: reject db names that contain / alpm downloads databases based on basename causing [foo] and [bar/foo] to silently overwrite each other. Also remove an extra tab Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5293d5784049869c965ee21f424b8845bdebb745 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Apr 20 11:02:18 2014 -0400 strtrim: reset pointer after trimming leading whitespace Breakage introduced in 92216c5864efccac when we changed the signature of strtrim to return something more useful. Fixes FS#39976. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6103183253f16edf32fb5c01a288a80a50092d88 Author: Steven Noonan <steven(a)uplinklabs.net> Date: Thu Apr 3 13:56:22 2014 +1000 makepkg: use dash instead of underscore in /usr/lib/debug/.build-id Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8b09e6656070f8c2551e3e0f75e40b3c2a669db Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 27 15:46:07 2014 +1000 repo-add: declare pkgbase as local commit ee72c016ab316aaca3781d2c45bf0de77fefcf3c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 21:34:34 2013 +1000 Always supply base name and version info in .PKGFILE if needed Provide pkgbase information for non-split packages with pkgbase set. Also record the version of the "base" package. This is useful for matching package files to source packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f0c3e5b983910dcaef3091ea622ebc3be0f5a0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 15:47:20 2013 +1000 makepkg: sign source packages with --sign Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b26432dbdbe7afdaa0743f6509cc69e1c7007981 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 24 09:59:43 2014 -0400 conf.c: remove extra indentation Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b0dc547fcbc3e4b0116f8982d500635ebdeb506c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 24 09:59:42 2014 -0400 check config_new return value Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fb8437b588356f2efd9dd093a304edc3a1859a1d Author: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Date: Tue Mar 11 19:29:22 2014 -0700 pacman/upgrade: Fix memory leaks Make sure allocated memory is freed before returning. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fcf0cefd1a9ae9bd3319c82a77ed38d7a2bc8db3 Author: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Date: Tue Mar 11 19:29:21 2014 -0700 pacman/upgrade: Refactor memory management Refactor the upgrade routine to use an array that can be allocated in one step instead of an alpm_list that is gradually extended in loops. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3ebb7b94d92cbdbf3f03ba8f13e15df7dca26e20 Author: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Date: Tue Mar 11 19:29:20 2014 -0700 pacman/upgrade: Check malloc() return value Check the return value of malloc() before dereferencing the returned pointer. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 8 +++ lib/libalpm/be_package.c | 2 + lib/libalpm/db.c | 3 +- lib/libalpm/dload.c | 15 ++-- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 158 ++++++++++++++++++++++++++++++++--------- scripts/repo-add.sh.in | 2 +- src/pacman/conf.c | 7 +- src/pacman/pacman.c | 5 +- src/pacman/remove.c | 12 +++- src/pacman/upgrade.c | 47 +++++++----- src/pacman/util.c | 3 +- src/util/pactree.c | 1 + test/pacman/pactest.py | 15 ++-- test/pacman/pmdb.py | 2 +- test/pacman/tests/remove001.py | 4 +- test/pacman/tests/sign002.py | 2 +- 17 files changed, 208 insertions(+), 79 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Do not check makepkg-wrapper for standard options
by Allan McRae 23 May '14

23 May '14

Fixes "make distcheck". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 43045df..0b756ad 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,5 +1,6 @@ # enforce that all scripts have a --help and --version option AUTOMAKE_OPTIONS = std-options +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = makepkg-wrapper SUBDIRS = po -- 1.9.3

1 0

[pacman-dev] [PATCH] dload: avoid using CURLOPT_FAILONERROR
by Dave Reisner 22 May '14

22 May '14

Use of this flag causes connections to be closed on 404s -- a common occurrence when your config sets DatabaseOptional. Handle the error gracefully, so that the connection can be reused. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This might be an upstream bug, but I'm not sure it makes sense to continue using this, regardless. lib/libalpm/dload.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 53867f5..88ea427 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -286,7 +286,6 @@ static void curl_set_handle_opts(struct dload_payload *payload, * to reset the handle's parameters for each time it's used. */ curl_easy_reset(curl); curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); @@ -478,12 +477,14 @@ static int curl_download_internal(struct dload_payload *payload, _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", payload->respcode); if(payload->respcode >= 400) { payload->unlink_on_fail = 1; - /* non-translated message is same as libcurl */ - snprintf(error_buffer, sizeof(error_buffer), - "The requested URL returned error: %ld", payload->respcode); - _alpm_log(handle, ALPM_LOG_ERROR, - _("failed retrieving file '%s' from %s : %s\n"), - payload->remote_name, hostname, error_buffer); + if(!payload->errors_ok) { + /* non-translated message is same as libcurl */ + snprintf(error_buffer, sizeof(error_buffer), + "The requested URL returned error: %ld", payload->respcode); + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed retrieving file '%s' from %s : %s\n"), + payload->remote_name, hostname, error_buffer); + } goto cleanup; } break; -- 1.9.2

2 1

[pacman-dev] [PATCH] util: Use off_t instead of int for size values
by Florian Pritz 22 May '14

22 May '14

Old output: > Total Installed Size: -1527.44 MiB Fixed: > Total Installed Size: 2568.56 MiB Bug introduced in 7b8f8753b15037bf4a88126ffde8195416432c72. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..03e5a21 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -432,7 +432,7 @@ static void table_free(alpm_list_t *headers, alpm_list_t *rows) alpm_list_free(rows); } -static void add_transaction_sizes_row(alpm_list_t **rows, char *label, int size) +static void add_transaction_sizes_row(alpm_list_t **rows, char *label, off_t size) { alpm_list_t *row = NULL; char *str; -- 1.9.2

2 1

[pacman-dev] Comments with `)' are either broken or disallowed
by Michael Witten 14 May '14

14 May '14

In `makepkg' (that is, in `scripts/makepkg.sh.in'), the following exist: local provides_list=() eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') ... local backup_list=() eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \ sed -e "s/backup=/backup_list+=/" -e "s/#.*//" -e 's/\\$//') ... local optdepends_list=() eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') ... local known kopt options_list eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \ sed -e "s/options=/options_list+=/" -e "s/#.*//" -e 's/\\$//') Perhaps there are more. As you can plainly see, this ruins the ability to include comments that use the `)' character, as in the following: options=( '!strip' '!makeflags' # Apparently, there are issues with concurrency (`-j2', etc.) ) Sincerely, Michael Witten

6 12

[pacman-dev] [PATCH] remove.c: downgrade TRANS_DUP_TARGET to warning
by Andrew Gregory 07 May '14

07 May '14

Matches the behavior for sync packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 12 +++++++++--- test/pacman/tests/remove001.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 933e6f7..38ad2a2 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -43,9 +43,15 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, - alpm_strerror(alpm_errno(config->handle))); - return -1; + alpm_errno_t err = alpm_errno(config->handle); + if(err == ALPM_ERR_TRANS_DUP_TARGET) { + /* just skip duplicate targets */ + pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target); + return 0; + } else { + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); + return -1; + } } config->explicit_removes = alpm_list_add(config->explicit_removes, pkg); return 0; diff --git a/test/pacman/tests/remove001.py b/test/pacman/tests/remove001.py index 02d00a4..263418b 100644 --- a/test/pacman/tests/remove001.py +++ b/test/pacman/tests/remove001.py @@ -5,5 +5,5 @@ self.args = "-R " + "foo "*5 -self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXIST=foo") +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=foo") -- 1.9.2

2 1