From owner-svn-ports-head@freebsd.org  Sat Jun  4 09:35:22 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B0ACB65849;
 Sat,  4 Jun 2016 09:35:22 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F1AE312ED;
 Sat,  4 Jun 2016 09:35:21 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u549ZLVZ079133;
 Sat, 4 Jun 2016 09:35:21 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u549ZLw7079132;
 Sat, 4 Jun 2016 09:35:21 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201606040935.u549ZLw7079132@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sat, 4 Jun 2016 09:35:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416352 - head/Mk/Scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2016 09:35:22 -0000

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