add tests for libreblacklist, fix a few bugs

2 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist
index 2f73a06..293f3ac 100755
--- a/src/lib/libreblacklist
+++ b/src/lib/libreblacklist
@@ -73,25 +73,25 @@ blacklist-update() (
 blacklist-lookup() {
 	local pkg=$1
 	# we accept that $pkg contains no regex-nes
-	blacklist-cat | grep "^$pkg:" || true
+	blacklist-normalize | grep "^$pkg:" || true
 }
 
-# Usage: blacklist-{cat|lookup} | blacklist-get-pkg
+# Usage: blacklist-cat | blacklist-get-pkg
 # Outputs only the package name field of the blacklist line(s) on stdin.
 blacklist-get-pkg() {
-	cut -d: -f1
+	blacklist-normalize | cut -d: -f1
 }
 
-# Usage: blacklist-{cat|lookup} | blacklist-get-rep
+# Usage: blacklist-cat | blacklist-get-rep
 # Outputs only the replacement package field of the blacklist line(s) on stdin.
 blacklist-get-rep() {
-	cut -d: -f2
+	blacklist-normalize | cut -d: -f2
 }
 
-# Usage: blacklist-{cat|lookup} | blacklist-get-reason
+# Usage: blacklist-cat | blacklist-get-reason
 # Outputs only the reason field of the blacklist line(s) on stdin.
 blacklist-get-reason() {
-	cut -d: -f3-
+	blacklist-normalize | cut -d: -f3-
 }
 
 if [[ "${0##*/}" == libreblacklist ]]; then
diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree
index c37b0bf..be9d20d 100755
--- a/src/pkgbuild-check-nonfree
+++ b/src/pkgbuild-check-nonfree
@@ -51,7 +51,7 @@ check_deps() (
 	)
 	local ret=0
 	for pkg in "${pkgs[@]}"; do
-		local line="$(blacklist-lookup "$pkg")"
+		local line="$(blacklist-cat|blacklist-lookup "$pkg")"
 		local rep="$(blacklist-get-rep <<<"$line")"
 		if [[ -z $line ]]; then
 			# not mentioned in blacklist; free