svn commit: r416352 - head/Mk/Scripts

[Mathieu Arnold]

Author: mat
Date: Sat Jun  4 09:35:21 2016
New Revision: 416352
URL: https://svnweb.freebsd.org/changeset/ports/416352

Log:
  Fix logic a bit, in case pkg is not installed (I guess.)
  
  PR:		209754
  Reported by:	Nick Evans
  Sponsored by:	Absolight

Modified:
  head/Mk/Scripts/check-vulnerable.sh   (contents, props changed)

Modified: head/Mk/Scripts/check-vulnerable.sh
==============================================================================
--- head/Mk/Scripts/check-vulnerable.sh	Sat Jun  4 09:16:17 2016	(r416351)
+++ head/Mk/Scripts/check-vulnerable.sh	Sat Jun  4 09:35:21 2016	(r416352)
@@ -24,14 +24,12 @@ if [ -x "${dp_PKG_BIN}" ]; then
 	vlist=$(${dp_PKG_BIN} audit "${dp_PKGNAME}" || :)
 	if [ "${vlist}" = "0 problem(s) in the installed packages found." ]; then
 		vlist=""
+	else
+		${dp_ECHO_MSG} "===>  ${dp_PKGNAME} has known vulnerabilities:"
+		${dp_ECHO_MSG} "$vlist"
+		${dp_ECHO_MSG} "=> Please update your ports tree and try again."
+		${dp_ECHO_MSG} "=> Note: Vulnerable ports are marked as such even if there is no update available."
+		${dp_ECHO_MSG} "=> If you wish to ignore this vulnerability rebuild with 'make DISABLE_VULNERABILITIES=yes'"
+		exit 1
 	fi
 fi
-
-if [ -n "$vlist" ]; then
-	${dp_ECHO_MSG} "===>  ${dp_PKGNAME} has known vulnerabilities:"
-	${dp_ECHO_MSG} "$vlist"
-	${dp_ECHO_MSG} "=> Please update your ports tree and try again."
-	${dp_ECHO_MSG} "=> Note: Vulnerable ports are marked as such even if there is no update available."
-	${dp_ECHO_MSG} "=> If you wish to ignore this vulnerability rebuild with 'make DISABLE_VULNERABILITIES=yes'"
-	exit 1
-fi