From 23faa9361d79d1d88754a1e1e5aa9f040b34545c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 26 Oct 2013 01:35:45 -0400
Subject: Merge pkgbuild-check-{nonfree,licenses}, add a summarize tool for it.

This should fix a number of bugs in those two scripts, and the summarize
script simplifies aur and libremakepkg:hooks-check.sh
---
 src/fullpkg/fullpkg-build | 7 ++-----
 src/fullpkg/fullpkg-find  | 7 -------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/fullpkg')

diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build
index e922877..8149453 100755
--- a/src/fullpkg/fullpkg-build
+++ b/src/fullpkg/fullpkg-build
@@ -29,11 +29,8 @@ list_pkgs() {
 check_nonfree() {
 	find "$build_dir" -name PKGBUILD \
 		-exec pkgbuild-check-nonfree {} +
-	if [ "$?" -eq 15 ]; then
-		error "Some PKGBUILD have nonfree problems"
-		exit 15
-	fi
-
+	local s=$?
+	pkgbuild-summarize-nonfree -q $s || return $s
 }
 
 # Removes a package from the buildorder
diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find
index 007c53c..566605a 100755
--- a/src/fullpkg/fullpkg-find
+++ b/src/fullpkg/fullpkg-find
@@ -93,13 +93,6 @@ find_deps() {
 	local repo="${repo:-$(guess_repo)}"
 	local pkgbase="${pkgbase:-${pkgname[0]}}"
 
-	if ! pkgbuild-check-nonfree > /dev/null 2> /dev/null; then
-		if [ "$?" -eq 15 ]; then
-			error "%s has nonfree issues" "$pkgbase"
-			return 15
-		fi
-	fi
-
 	# Checking any package built, since otherwise e.g. kdebase would
 	# be always considered outdated: there is no package built named kdebase.
 	# TODO: maybe check for the package requested in case of recursive calls,
-- 
cgit v1.2.3-54-g00ecf