diff options
| author | Erich Eckner <git@eckner.net> | 2017-10-06 13:06:43 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-10-06 13:06:43 +0200 |
| commit | ea10fdd184195317fe6716a8db0c0a11bcfae5e4 (patch) | |
| tree | eb5d5542c9a33c8688516e713657aae012e8b3fd | |
| parent | d7cfb0842f571ab160f7a0794164733a5145c050 (diff) | |
| download | builder-ea10fdd184195317fe6716a8db0c0a11bcfae5e4.tar.xz | |
bin/get-package-updates, bin/seed-build-list, bin/why-dont-you: remove comments from blacklist
| -rwxr-xr-x | bin/get-package-updates | 6 | ||||
| -rwxr-xr-x | bin/seed-build-list | 4 | ||||
| -rwxr-xr-x | bin/why-dont-you | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates index 7e474fa..af33653 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -238,7 +238,11 @@ black_listed='' black_listed_new=$( ( git -C "${repo_paths__archlinux32}" archive "$(cat "${work_dir}/archlinux32.revision")" -- 'blacklist' | \ - tar -Ox 'blacklist' + tar -Ox 'blacklist' | \ + sed ' + s/\s*#.*$// + /^\s*$/d + ' find "${work_dir}/package-infos" -maxdepth 1 -name 'lib32-*' -printf '%f\n' | \ sed 's|\(\.[^.]\+\)\{4\}$||' | \ uniq diff --git a/bin/seed-build-list b/bin/seed-build-list index b3f2cd0..6b40064 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -244,6 +244,10 @@ fi # ignore packages on the blacklist git -C "${repo_paths__archlinux32}" archive "$(cat "${work_dir}/archlinux32.revision")" -- blacklist | \ tar -Ox blacklist | \ + sed ' + s/\s*#.*$// + /^\s*$/d + ' | \ awk '{print "X X X " $1}' | \ sed 'p' diff --git a/bin/why-dont-you b/bin/why-dont-you index 8e9cb1d..45df942 100755 --- a/bin/why-dont-you +++ b/bin/why-dont-you @@ -219,6 +219,10 @@ case "${action}" in if git -C "${repo_paths__archlinux32}" archive "$(cat "${work_dir}/archlinux32.revision")" -- blacklist | \ tar -Ox 'blacklist' | \ + sed ' + s/\s*#.*$// + /^\s*$/d + ' | \ grep -qxF "${pkg}"; then printf 'Package "%s" is explicitely blacklisted.\n' "${pkg}" continue |