[PATCH] paccache: Skip .sig files when globbing candidates for removal

Johannes Löthberg johannes at kyriasis.com
Thu Feb 22 23:53:24 UTC 2018


Quoting Maxim Baz (2018-02-23 00:21:11)
> Basically allow any extension after '.tar' except '.sig'.
> This is needed to correctly count the possible candidates for removal.
> Signature files are correctly considered later in the script.
> Fixes FS#57503
> 
> Signed-off-by: Maxim Baz <git at maximbaz.com>
> ---
>  src/paccache.sh.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/paccache.sh.in b/src/paccache.sh.in
> index 49680be..135954f 100644
> --- a/src/paccache.sh.in
> +++ b/src/paccache.sh.in
> @@ -308,7 +308,7 @@ for cachedir in "${cachedirs[@]}"; do
>         # note that these results are returned in an arbitrary order from awk, but
>         # they'll be resorted (in summarize) iff we have a verbosity level set.
>         IFS=$'\n' read -r -d '' -a cand < \
> -               <(printf '%s\n' "$PWD"/*.pkg.tar?(.+([^.])) | pacsort --files |
> +               <(printf '%s\n' "$PWD"/*.pkg.tar!(*.sig) | pacsort --files |
>                         pkgfilter "$keep" "$scanarch" \
>                                 "${#whitelist[*]}" "${whitelist[@]}" \
>                                 "${#blacklist[*]}" "${blacklist[@]}")
> -- 
> 2.16.2

Awesome, thanks for the patch!

-- 
Sincerely,
  Johannes Löthberg
  PGP Key ID: 0x50FB9B273A9D0BB5
  PGP Key FP: 5134 EF9E AF65 F95B 6BB1  608E 50FB 9B27 3A9D 0BB5
  https://theos.kyriasis.com/~kyrias/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1727 bytes
Desc: signature
URL: <https://lists.archlinux.org/pipermail/pacman-contrib/attachments/20180223/e551ac56/attachment.asc>


More information about the pacman-contrib mailing list