From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 30 Oct 2009 16:46:26 +0000 (+0100)
Subject: naoki: Improve validation of a package.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ab3aafef318bfcddb284955632d8dddb8032ea2;p=ipfire-3.x.git

naoki: Improve validation of a package.
---

diff --git a/tools/package-functions b/tools/package-functions
index 5f924763d..c6db59060 100644
--- a/tools/package-functions
+++ b/tools/package-functions
@@ -17,7 +17,7 @@ function listmatch() {
 function is_package() {
 	local package=$(find_package ${1})
 
-	if listmatch ${package} $(package_list); then
+	if [ -e "${PKG_DIR}/${package}/${package##*/}.nm" ]; then
 		return 0
 	else
 		log ERROR "Package ${package} is not known."
@@ -75,7 +75,12 @@ function package_list() {
 				continue
 			fi
 
-			echo "${package#${PKG_DIR}/}"
+			package=${package#${PKG_DIR}/}
+
+			# Skip if package does not fullfill our criteria
+			is_package ${package} || continue
+
+			echo "${package}"
 		done
 	done
 }