summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2017-01-20 18:14:35 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2017-01-20 18:14:35 -0500
commitde9f3bae65a3c488a11a998fa177921ed4cab339 (patch)
tree3c7c13b8e7335c533b3f9ff4ba96c2cf37f06a11
parent973daf0b56132ff451913fc127521ab5fcd5d033 (diff)
Fix: `libreblacklist get-pkg` requires the full blacklist on stdin.parabola/20170120.1
-rwxr-xr-xdb-check-nonfree2
-rwxr-xr-xdb-import-archlinux-pkg2
-rwxr-xr-xdb-import-archlinux-src2
-rwxr-xr-xdb-import-archlinuxarm-pkg2
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=()