From 2343bb827d3850e0c63937b62f9097e935b491c4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 27 Jun 2017 12:37:05 +0200 Subject: bin/get-package-updates: bugfix black listing --- bin/get-package-updates | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'bin/get-package-updates') diff --git a/bin/get-package-updates b/bin/get-package-updates index 9d5a4c4..5c0fc77 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -222,8 +222,10 @@ echo 'apply blacklisting' black_listed='' black_listed_new="$( cat "${repo_paths__archlinux32}/blacklist" - ls "${work_dir}/package-infos/" | \ - grep '^lib32-.*\.depends' | \ + ls "${work_dir}/package-infos" | \ + grep '\.depends$' | \ + sed "s|^|${work_dir}/package-infos/|" | \ + xargs -r grep -l '^lib32-' | \ sed ' s|^.*/|| s|\(\.[^.]\+\)\{3\}$|| @@ -237,13 +239,23 @@ while [ -n "${black_listed_new}" ]; do black_listed_new="$( echo "${black_listed_new}" | \ while read -r bl_package; do - grep -lxF "${bl_package}" "${work_dir}/package-infos/"*.depends | \ + ls "${work_dir}/package-infos" | \ + grep '\.depends$' | \ + sed "s|^|${work_dir}/package-infos/|" | \ + xargs -r grep -lxF "${bl_package}" | \ sed ' s|^.*/|| s|\(\.[^.]\+\)\{3\}$|| ' done | \ - grep -v '^python-pysocks$\|^gens$' | \ + while read -r pkg; do + if [ "${pkg}" = 'python-pysocks' ] || \ + [ "${pkg}" = 'gens' ]; then + >&2 printf 'blacklisting: %s would be black listed, but is ignored.' "${pkg}" + else + echo "${pkg}" + fi + done | \ sort -u )" black_listed_new="$( -- cgit v1.2.3-54-g00ecf