- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] makepkg: introduce .SRCINFO files for source packages
by Dave Reisner 09 Nov '14

09 Nov '14

Similar to .PKGINFO, .SRCINFO provides structured metadata from the PKGBUILD to be included with source packages. The format is structured such that it contains a "pkgbase" and one to many "pkgname" sections. Each "pkgname" section represents an "output package", and inherits all of the attributes of the "pkgbase" section, and then can define their own additive fields. For example, a simple PKGBUILD: pkgbase=ponies pkgname=('applejack' 'pinkiepie') pkgver=1.2.3 pkgrel=1 arch=('x86_64' 'i686') depends=('friendship' 'magic') build() { ...; } package_applejack() { provides=('courage') ...; } package_pinkiepie() { provides=('laughter') ...; } Would yield the following .SRCINFO file: pkgbase = ponies pkgdesc = friendship is magic pkgver = 1.2.3 pkgrel = 1 arch = x86_64 arch = i686 depends = friendship depends = magic pkgname = applejack provides = courage pkgname = pinkiepie provides = laughter The code to generate this new file is taken a project which I've been incubating[0] under the guise of 'mkaurball', which creates .AURINFO files for the AUR. AURINFO is the exactly same file as .SRCINFO, but named as such to make it clear that this is specific to the AUR. Because we're parsing shell in the packaging functions rather than executing it, there *are* some limitations, but these only really crop up in more "exotic" PKGBUILDs. Smoketesting[1] for accuracy in the Arch repos yields 100% accuracy for [core] and [extra]. [community] clocks in at ~98% accuracy (.3% difference per PKGBUILD), largely due to silly haskell packages calling pacman from inside the PKGBUILD to determine dependencies. [multilib] currently shows about 92% accuracy -- a statistic which can be largely improved by utilizing the recently merged arch-specific attribute work. This is also a smaller repo so the numbers are somewhat inflated. In reality, this is only a .8% variance per PKGBUILD. Together, we can make PKGBUILD better. [0] https://github.com/falconindy/pkgbuild-introspection [1] https://github.com/falconindy/pkgbuild-introspection/blob/master/test/smoke… --- Based on Allan's recent email about the feature freeze being pushed back, I'm offering this up for discussion. scripts/makepkg.sh.in | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a67d94..0349e05 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2031,6 +2031,99 @@ find_libprovides() { printf '%s\n' "${libprovides[@]}" } +srcinfo_open_section() { + printf '%s = %s\n' "$1" "$2" +} + +srcinfo_close_section() { + echo +} + +srcinfo_write_attr() { + # $1: attr name + # $2: attr values + + local attrname=$1 attrvalues=("${@:2}") + + # normalize whitespace, strip leading and trailing + attrvalues=("${attrvalues[@]//+([[:space:]])/ }") + attrvalues=("${attrvalues[@]#[[:space:]]}") + attrvalues=("${attrvalues[@]%[[:space:]]}") + + printf "\t$attrname = %s\n" "${attrvalues[@]}" +} + +pkgbuild_extract_to_srcinfo() { + # $1: pkgname + # $2: attr name + # $3: multivalued + + local pkgname=$1 attrname=$2 isarray=$3 outvalue= + + if pkgbuild_get_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then + srcinfo_write_attr "$attrname" "${outvalue[@]}" + fi +} + +srcinfo_write_section_details() { + local attr package_arch a + local multivalued_arch_attrs=(source provides conflicts depends replaces + optdepends makedepends checkdepends) + + for attr in "${singlevalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 0 + done + + for attr in "${multivalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 1 + done + + pkgbuild_get_attribute "$1" 'arch' 1 'package_arch' + for a in "${package_arch[@]}"; do + # 'any' is special. there's no support for, e.g. depends_any. + [[ $a = any ]] && continue + + for attr in "${multivalued_arch_attrs[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 + done + done +} + +srcinfo_write_global() { + local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) + local multivalued=(arch groups license checkdepends makedepends + depends optdepends provides conflicts replaces + noextract options backup + source {md5,sha{1,224,256,384,512}}sums) + + srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" + srcinfo_write_section_details '' + srcinfo_close_section +} + +srcinfo_write_package() { + local singlevalued=(pkgdesc url install changelog) + local multivalued=(arch groups license checkdepends depends optdepends + provides conflicts replaces options backup) + + srcinfo_open_section 'pkgname' "$1" + srcinfo_write_section_details "$1" + srcinfo_close_section +} + +write_srcinfo() { + local pkg + + printf "# Generated by makepkg %s\n" "$makepkg_version" + printf "# %s\n" "$(LC_ALL=C date -u)" + + srcinfo_write_global + + for pkg in "${pkgname[@]}"; do + srcinfo_write_package "$pkg" + done +} + write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then @@ -2243,6 +2336,9 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" + msg2 "$(gettext "Generating %s file...")" .SRCINFO + write_srcinfo > "$srclinks/$pkgbase"/.SRCINFO + local file all_sources get_all_sources 'all_sources' -- 2.1.2

3 5

[pacman-dev] [PATCH 1/4] makepkg: ignore empty global attributes for SRCINFO
by Dave Reisner 05 Nov '14

05 Nov '14

--- 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 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi } -- 2.1.3

3 7

[pacman-dev] [PATCH 1/2] Add --assume-installed to pacman --help
by Florian Pritz 05 Nov '14

05 Nov '14

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3d1406b..6161048 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -185,6 +185,8 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); + addlist(_(" --assume-installed <package=version>\n" + " add a virtual package to satisfy dependencies\n")); addlist(_(" --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); -- 2.1.3

2 3

[pacman-dev] [PATCH] makepkg: git-clone with --bare instead of --mirror
by Johannes Löthberg 05 Nov '14

05 Nov '14

The --mirror switch pulls down all refs in a repository, even ones that aren't regular branches and tags. Since sites like GitHub stores a ref for every pull request under the refs/pull/ namespace, --mirror will pull down the history that has been part of every pull request, even after a someone has for example run git-filter-branch on it to get some big binaries out of the history, which sometimes blows the repository size and the time to clone it up by a very large factor. Using --bare solves this as it only pulls down branches and tags, and all makepkg needs is a bare repository. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- 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 8a67d94..d3854be 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -542,7 +542,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --bare "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.1.3

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-475-gbd744d0
by allan＠archlinux.org 04 Nov '14

04 Nov '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 bd744d067da1ac455e8a9cdfb622c655f14e485d (commit) via 8cd41ec62bb081c8cdedafab2a96166d861939b5 (commit) via 4114e25df15a3f98bdd6f2d8e86996f1f8f04100 (commit) via 1e0b2f6629f82c345b65693d607857c1c021aa6a (commit) via 566dc233570c58a833da06233d3e6279b89df1e1 (commit) via 75c80caebc8b5b6e3630af68b786c649c450fc95 (commit) via 82208c0239312fdf3da19892dc6a04e3e4cc3bb7 (commit) via 9d4d81783d59d5abf90f6ca3093f67b3ecfec7fc (commit) via d649dc669db2201b274919223ed0aa6b7c37d70d (commit) via 91876c21f16ec14b8b7362a98b72588aeb893ea3 (commit) via 44bcb7332766dc6562a4cd74ad1fd55f52041e64 (commit) via d6785a572638f8ab0550aeefca096dca2020a0fc (commit) via d8f395fb563d3988f8a3bed16808e6ac5ca56435 (commit) via 11dff8a50e8b1801a97a4dc08b567ae94d8060c2 (commit) via 9d96bed9d6b57c1f3cfb4220e80f6dd473d86683 (commit) from a0cfed7df2ffac12df2bc935c53d273230f8aaa4 (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 bd744d067da1ac455e8a9cdfb622c655f14e485d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 20 13:49:47 2014 -0400 add pacman-db-upgrade-v9.py to check_SCRIPTS Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8cd41ec62bb081c8cdedafab2a96166d861939b5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 23 02:54:50 2014 -0400 tests/pacman-db-upgrade-v9: set additional paths --config does not respect root, causing pacman-db-upgrade to read the local pacman.conf rather than the one in the test root. Also add a rule to ensure the ALPM_DB_VERSION file is actually being created. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4114e25df15a3f98bdd6f2d8e86996f1f8f04100 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 23 02:53:44 2014 -0400 pmtest: make test paths easily available to tests Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e0b2f6629f82c345b65693d607857c1c021aa6a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 20 13:50:23 2014 -0400 pacman-db-upgrade: fix --config option typo Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 566dc233570c58a833da06233d3e6279b89df1e1 Author: Eric Schultz <eric(a)schultzter.ca> Date: Wed Oct 29 09:16:00 2014 -0400 Exit with 0/SUCCESS if there are no packages to remove Previously the lack of candidate packages was considered an error and return 1/FAILURE but really this isn't an issue. Also, for systemd (and others) this flagged the instance as having failed for no good reason. Signed-off-by: Eric Schultz <eric(a)schultzter.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 75c80caebc8b5b6e3630af68b786c649c450fc95 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 18 08:38:53 2014 -0400 makepkg.8: fix typo in reference to other flag it's --syncdeps, not --syndeps commit 82208c0239312fdf3da19892dc6a04e3e4cc3bb7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 15 05:38:55 2014 -0400 testdb: ignore ALPM_DB_VERSION Replaces the test for hidden files which appears to be leftover from 2e431e1cc before sync db checking was moved to a separate function. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9d4d81783d59d5abf90f6ca3093f67b3ecfec7fc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Oct 15 08:52:25 2014 -0400 paccache: avoid spurious blank line written to stderr this is just stylistic formatting, so write it to stdout. ref: https://bugs.archlinux.org/task/42389 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d649dc669db2201b274919223ed0aa6b7c37d70d Author: Christian Hesse <mail(a)eworm.de> Date: Thu Oct 16 15:36:55 2014 +0200 dload: mark final_url as const Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91876c21f16ec14b8b7362a98b72588aeb893ea3 Author: Miguel de Val-Borro <miguel(a)archlinux.net> Date: Wed Oct 15 12:17:11 2014 -0400 doc/translation-help.txt: Removed out-of-date paragraph Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 44bcb7332766dc6562a4cd74ad1fd55f52041e64 Author: Miguel de Val-Borro <miguel(a)archlinux.net> Date: Wed Oct 15 12:16:55 2014 -0400 doc/translation-help.txt: Minor rewording of Transifex usage Updated as per Allan's suggestion and fixed Transifex URLs. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d6785a572638f8ab0550aeefca096dca2020a0fc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 18 08:27:07 2014 -0400 makepkg: always look for sources in source=() This regression snuck in during some reviewing of 963f7fe02fcb14 (arch-specific sources). We must always check the source=() array for sources. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f395fb563d3988f8a3bed16808e6ac5ca56435 Author: Christian Hesse <mail(a)eworm.de> Date: Thu Oct 9 09:51:51 2014 +0200 dload: unlink file on filesize exceeded error On filesize exceeded error pacman leaves a .part file in cache dir, resulting in this error on next try: error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Unlink the file on error to avoid this. commit 11dff8a50e8b1801a97a4dc08b567ae94d8060c2 Author: Christian Hesse <mail(a)eworm.de> Date: Fri Oct 10 10:29:04 2014 +0200 dload: use better error message on exceeded file size Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9d96bed9d6b57c1f3cfb4220e80f6dd473d86683 Author: Christian Hesse <mail(a)eworm.de> Date: Mon Oct 6 13:00:38 2014 +0200 be_sync: use effective URL for db file signature download If download server is dynamic mirror chances are that db file download and db file signature download are redirected to different mirrors, resulting in invalid signature. This uses effective URL for db file signature download and makes the files always match. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 4 ++-- doc/makepkg.8.txt | 2 +- doc/translation-help.txt | 18 +++++++----------- lib/libalpm/be_sync.c | 10 +++++----- lib/libalpm/dload.c | 15 +++++++-------- lib/libalpm/dload.h | 2 +- scripts/makepkg.sh.in | 6 +++--- scripts/pacman-db-upgrade.sh.in | 2 +- src/util/testdb.c | 2 +- test/pacman/pmtest.py | 20 ++++++++++++++++---- test/scripts/Makefile.am | 1 + test/scripts/pacman-db-upgrade-v9.py | 6 +++++- 12 files changed, 50 insertions(+), 38 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Exit with 0/SUCCESS if there are no packages to remove
by Eric Schultz 29 Oct '14

29 Oct '14

Previously the lack of candidate packages was considered an error and return 1/FAILURE but really this isn't an issue. Also, for systemd (and others) this flagged the instance as having failed for no good reason. Signed-off-by: Eric Schultz <eric(a)schultzter.ca> --- contrib/paccache.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 71aee23..b3b553d 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -328,7 +328,7 @@ done if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' - exit 1 + exit 0 fi # grab this prior to signature scavenging -- 2.1.2

1 0

[pacman-dev] [PATCH] makepkg: Use a recursive, shallow clone for git://
by Drew DeVault 29 Oct '14

29 Oct '14

makepkg: Use a recursive, shallow clone for git:// This clones git submodules, which are required to build most projects that use them. This change is harmless for packages that don't use them. This also modifies the initial clone to use --depth=1, which avoids checking out the entire history and saves some bandwidth and improves the time required to clone. Signed-off-by: Drew DeVault <sir(a)cmpwn.com> --- I'm still not used to submitting patches through a mailing list, so I apologize if I've done something wrong. Please don't hesitate to let me know if there's something I could do better. scripts/makepkg.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a67d94..3b74d4d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -542,7 +542,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --depth=1 --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -612,6 +612,11 @@ extract_git() { plain "$(gettext "Aborting...")" exit 1 fi + if ! git submodule update --init --recursive ; then + error "$(gettext "Failure while initializing submodules of %s %s repo")" "${repo}" "git" + plain "$(gettext "Aborting...")" + exit 1 + fi fi popd &>/dev/null -- 2.1.2

6 10

[pacman-dev] [PATCH] Added option to return success when there are no candidates for removal
by Eric Schultz 28 Oct '14

28 Oct '14

Add the -n or --noneisok option to return success if there are no candidates for removal. This is useful when checking the exit code, like from a systemd unit, and it is okay when there are no packages to remove. Signed-off-by: Eric Schultz <eric(a)schultzter.ca> --- contrib/paccache.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 71aee23..cf1ba15 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -24,7 +24,7 @@ declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() -declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 +declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 noneisok=0 totalsaved=0 verbose=0 declare delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -192,6 +192,8 @@ Usage: ${myname} <operation> [options] [targets...] delimited. -k, --keep <num> keep "num" of each package in the cache (default: 3). --nocolor remove color from output. + -n, --noneisok returns 0 (no error) rather than 1 (failed) when there + are no candidate packages for removal -u, --uninstalled target uninstalled packages. -v, --verbose increase verbosity. specify up to 3 times. -z, --null use null delimiters for candidate names (only with -v @@ -205,9 +207,9 @@ version() { echo 'Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org>' } -OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' +OPT_SHORT=':a:c:dfhi:k:m:nrsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' - 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') + 'nocolor' 'noneisok' 'remove' 'uninstalled' 'version' 'verbose' 'null') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -249,6 +251,8 @@ while :; do shift ;; --nocolor) USE_COLOR='n' ;; + -n|--noneisok) + noneisok=1 ;; -m|--move) move=1 movedir=$2 shift ;; @@ -328,7 +332,11 @@ done if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' - exit 1 + if (( noneisok )); then + exit 0 + else + exit 1 + fi fi # grab this prior to signature scavenging -- 2.1.2

2 1

Re: [pacman-dev] FS#42482 - [paccache] No candidates should not be an error
by Eric Schultz 28 Oct '14

28 Oct '14

> > ---------- Forwarded message ---------- > From: Florian Pritz <bluewind(a)xinu.at> > To: pacman-dev(a)archlinux.org > Cc: > Date: Tue, 28 Oct 2014 10:41:31 +0100 > Subject: Re: [pacman-dev] FS#42482 - [paccache] No candidates should not be an error > On 28.10.2014 03:44, Eric Schultz wrote: > > declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() > > -declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 > > verbose=0 > > +declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 noneisok=0 > > totalsaved=0 verbose=0 > > declare delim=$'\n' keep=3 movedir= scanarch= > > Dan tried to link this earlier but missed the l of html so here's the > link again: https://www.archlinux.org/pacman/submitting-patches.html > > Please use git-send-email and nothing else (especially don't paste a > patch in gmail) because that is bound to break formatting as can be seen > above (no indentation, wrapped lines). > > Also if you have any comments to add that are not part of a commit use > git send-email --annotate and add them between the --- marker and the > diffstat. > > BTT: I also don't see why paccache should exit 1. Looks like this was in > the initial version Dave wrote so maybe he can chime in? > Ok, I'll try to figure-out configuring git send-email given my network constraints. As for whether no candidates should just exit 0 I would agree. However since paccache with it's current behaviour is out in the wild I figured adding a flag that provides alternate behaviour would be more prudent than changing the current behaviour (in case anyone relies on it). I'll happily go back and change just one character in the original version and re-submit if you all agree that's what's to be done. -- Headed for the second star to the right and straight on 'til morning... Eric Schultz (aka schultzter) Read more at 2FatDads

1 0

Re: [pacman-dev] FS#42482 - [paccache] No candidates should not be an error
by Eric Schultz 28 Oct '14

28 Oct '14

I've written a patch for this feature request, I hope this is okay. >From c332ee7030fba07e6efe8e6635d3d1648a97ba13 Mon Sep 17 00:00:00 2001 From: Eric Schultz <eric(a)schultzter.ca> Date: Mon, 27 Oct 2014 22:24:23 -0400 Subject: [PATCH] Added option to return success when there are no candidates for removal Add the -n or --noneisok option to return success if there are no candidates for removal. This is useful when checking the exit code, like from a systemd unit, and it is okay when there are no packages to remove. Signed-off-by: Eric Schultz <eric(a)schultzter.ca> --- contrib/paccache.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 71aee23..cf1ba15 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -24,7 +24,7 @@ declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() -declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 +declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 noneisok=0 totalsaved=0 verbose=0 declare delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -192,6 +192,8 @@ Usage: ${myname} <operation> [options] [targets...] delimited. -k, --keep <num> keep "num" of each package in the cache (default: 3). --nocolor remove color from output. + -n, --noneisok returns 0 (no error) rather than 1 (failed) when there + are no candidate packages for removal -u, --uninstalled target uninstalled packages. -v, --verbose increase verbosity. specify up to 3 times. -z, --null use null delimiters for candidate names (only with -v @@ -205,9 +207,9 @@ version() { echo 'Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org>' } -OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' +OPT_SHORT=':a:c:dfhi:k:m:nrsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' - 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') + 'nocolor' 'noneisok' 'remove' 'uninstalled' 'version' 'verbose' 'null') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -249,6 +251,8 @@ while :; do shift ;; --nocolor) USE_COLOR='n' ;; + -n|--noneisok) + noneisok=1 ;; -m|--move) move=1 movedir=$2 shift ;; @@ -328,7 +332,11 @@ done if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' - exit 1 + if (( noneisok )); then + exit 0 + else + exit 1 + fi fi # grab this prior to signature scavenging -- 2.1.2 -- Headed for the second star to the right and straight on 'til morning... Eric Schultz <http://schultzter.ca> (aka schultzter <http://twitter.com/schultzter>) Read more at 2FatDads <http://2fatdads.com/author/schultzter/>

3 2