From 0515859f664070dd1a61a9b7f22ca058999a15a5 Mon Sep 17 00:00:00 2001
From: Erich Eckner <erich.eckner.ext@bestsecret.com>
Date: Tue, 23 May 2023 13:13:48 +0200
Subject: fix blacklisting

* do not miss, if a package is added to the blacklist
---
 bin/get-package-updates | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'bin/get-package-updates')

diff --git a/bin/get-package-updates b/bin/get-package-updates
index 6c8192b..0f8dae0 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -462,17 +462,26 @@ while read -r pkgbase repository git_revision mod_git_revision; do
 done \
 < "${tmp_dir}/modified-packages"
 
-# extract black-listed packages
-git -C "${repo_paths__archlinux32}" archive "${new_repo_revisions__archlinux32}" -- 'blacklist' \
-| tar -t 'blacklist' \
-| sed '
-  s@^blacklist/\([^/]\+\)/[^/]\+/\([^/]\+\)$@\1\t\2@
-  t
-  d
-' \
+echo 'remove blacklisted packages'
+
+{
+  git -C "${repo_paths__archlinux32}" archive "${new_repo_revisions__archlinux32}" -- 'blacklist' \
+  | tar -t 'blacklist' \
+  | sed '
+    s@^blacklist/\([^/]\+\)/[^/]\+/\([^/]\+\)$@\1 \2@
+    t
+    d
+  ' \
+  | sort -k2,2 \
+  | join -1 1 -2 2 -o 2.1,2.2 "${tmp_dir}/modified-packages" -
+  git -C "${repo_paths__archlinux32}" diff --name-status "${old_repo_revisions__archlinux32}" "${new_repo_revisions__archlinux32}" -- 'blacklist' \
+  | sed '
+    s@^[AM]\sblacklist/\([^/]\+\)/[^/]\+/\([^/]\+\)$@\1 \2@
+    t
+    d
+  '
+} \
 | expand_blacklist_architectures "${tmp_dir}/architecture-compatibilities" \
-| sort -k2,2 \
-| join -1 1 -2 2 -o 2.1,2.2 "${tmp_dir}/modified-packages" - \
 | sort -u \
 | while read -r arch pkgbase; do
   delete_package "${arch}" "${pkgbase}" '%s'
-- 
cgit v1.2.3-54-g00ecf