From de9f3bae65a3c488a11a998fa177921ed4cab339 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 20 Jan 2017 18:14:35 -0500 Subject: Fix: `libreblacklist get-pkg` requires the full blacklist on stdin. --- db-check-nonfree | 2 +- db-import-archlinux-pkg | 2 +- db-import-archlinux-src | 2 +- db-import-archlinuxarm-pkg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db-check-nonfree b/db-check-nonfree index dd69501..7cbeb8f 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -17,7 +17,7 @@ done msg "Check nonfree in repo:" libreblacklist update -nonfree=($(libreblacklist get-pkg | sort -u)) +nonfree=($(libreblacklist cat | libreblacklist get-pkg | sort -u)) for repo in "${ARCHREPOS[@]}"; do for pkgarch in "${ARCHES[@]}"; do msg2 "%s %s" "$repo" "$pkgarch" diff --git a/db-import-archlinux-pkg b/db-import-archlinux-pkg index b9389ba..d43a245 100755 --- a/db-import-archlinux-pkg +++ b/db-import-archlinux-pkg @@ -55,7 +55,7 @@ init() { # Get the blacklisted packages libreblacklist update - blacklist=($(libreblacklist get-pkg)) + blacklist=($(libreblacklist cat | libreblacklist get-pkg)) # Store all the whitelist files whitelists=() diff --git a/db-import-archlinux-src b/db-import-archlinux-src index 2b1397d..9d990a4 100755 --- a/db-import-archlinux-src +++ b/db-import-archlinux-src @@ -23,7 +23,7 @@ function sync_abs() { function get_blacklist() { libreblacklist update - libreblacklist get-pkg | sort -u | \ + libreblacklist cat | libreblacklist get-pkg | sort -u | \ss sed "s/^/**\//" > ${BLFILE} || { printf "[FAILED]\n" return 1 diff --git a/db-import-archlinuxarm-pkg b/db-import-archlinuxarm-pkg index 22fa94a..96dfc41 100755 --- a/db-import-archlinuxarm-pkg +++ b/db-import-archlinuxarm-pkg @@ -55,7 +55,7 @@ init() { # Get the blacklisted packages libreblacklist update - blacklist=($(libreblacklist get-pkg)) + blacklist=($(libreblacklist cat | libreblacklist get-pkg)) # Store all the whitelist files whitelists=() -- cgit v1.2.3