From owner-svn-ports-all@freebsd.org  Fri Jun  1 16:20:54 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 359DAF78F75;
 Fri,  1 Jun 2018 16:20:54 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3630C8499A;
 Fri,  1 Jun 2018 16:20:52 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1AD32B157;
 Fri,  1 Jun 2018 16:20:51 +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 w51GKpZZ004515;
 Fri, 1 Jun 2018 16:20:51 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w51GKpZD004514;
 Fri, 1 Jun 2018 16:20:51 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201806011620.w51GKpZD004514@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: Fri, 1 Jun 2018 16:20:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r471273 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 471273
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jun 2018 16:20:54 -0000

Author: mat
Date: Fri Jun  1 16:20:51 2018
New Revision: 471273
URL: https://svnweb.freebsd.org/changeset/ports/471273

Log:
  SC2155: Declare and assign separately to avoid masking return values.
  
  In the original code, the return value of mycmd is ignored, and export
  will instead always return true. This may prevent conditionals, set -e
  and traps from working correctly.
  
  PR:		227109
  Submitted by:	mat
  Sponsored by:	Absolight

Modified:
  head/Mk/Scripts/smart_makepatch.sh   (contents, props changed)

Modified: head/Mk/Scripts/smart_makepatch.sh
==============================================================================
--- head/Mk/Scripts/smart_makepatch.sh	Fri Jun  1 16:20:48 2018	(r471272)
+++ head/Mk/Scripts/smart_makepatch.sh	Fri Jun  1 16:20:51 2018	(r471273)
@@ -276,7 +276,8 @@ conserve_old_patches() {
 }
 
 install_regenerated_patches() {
-	local testdir=$(find ${DESTDIR} -empty)
+	local testdir
+	testdir=$(find ${DESTDIR} -empty)
 	if [ -z "${testdir}" ]; then
 		mkdir -p ${PATCHDIR}
 		find ${DESTDIR} -type f -exec mv {} ${PATCHDIR}/ \;