* Use python for identify nonfree in db-check-nonfree

1 files changed, 3 insertions, 8 deletions

diff --git a/db-check-nonfree b/db-check-nonfree
index 83efb14..d8f34f0 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -23,15 +23,10 @@ for repo in ${ARCHREPOS[@]}; do
 	if [ ! -f "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" ]; then
 	    continue
 	fi
-	unset dbpkgs
 	unset cleanpkgs
-	cleanpkgs=()
-	dbpkgs=($(bsdtar -xOf "${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}" | awk '/^%NAME%/{getline;print}' | sort -u ))
-	for pkgname in ${dbpkgs[@]}; do
-	    if in_array ${pkgname} ${nonfree[@]}; then
-		cleanpkgs[${#cleanpkgs[*]}]=${pkgname}
-	    fi
-	done
+        cmd_="$(dirname $0)/list_nonfree_in_db.py -k ${BLACKLIST_FILE} \
+            -b ${FTP_BASE}/${repo}/os/${pkgarch}/${repo}${DBEXT}"
+	cleanpkgs=($(${cmd_}))
 	if [ ${#cleanpkgs[@]} -ge 1 ]; then
 	    arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]}
 	fi