From owner-svn-src-head@freebsd.org Sun Jul 22 23:33:49 2018 Return-Path: Delivered-To: svn-src-head@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 BE86C1032F62; Sun, 22 Jul 2018 23:33:49 +0000 (UTC) (envelope-from mmacy@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 6A9658AB17; Sun, 22 Jul 2018 23:33:49 +0000 (UTC) (envelope-from mmacy@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 4BCCA14C47; Sun, 22 Jul 2018 23:33:49 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6MNXn6E061223; Sun, 22 Jul 2018 23:33:49 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6MNXnoj061222; Sun, 22 Jul 2018 23:33:49 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201807222333.w6MNXnoj061222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sun, 22 Jul 2018 23:33:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336624 - head/release X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 336624 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2018 23:33:49 -0000 Author: mmacy Date: Sun Jul 22 23:33:48 2018 New Revision: 336624 URL: https://svnweb.freebsd.org/changeset/base/336624 Log: fix use of empty in Makefile.ec2 empty() takes a variable name - not the expanded value Reported by: sjg Modified: head/release/Makefile.ec2 Modified: head/release/Makefile.ec2 ============================================================================== --- head/release/Makefile.ec2 Sun Jul 22 23:32:21 2018 (r336623) +++ head/release/Makefile.ec2 Sun Jul 22 23:33:48 2018 (r336624) @@ -16,11 +16,11 @@ SVN_CMD= ${_P}/${_S} . endfor .endif .if exists(${SRCTOP}/.svn) -. if empty(${EC2_SVNBRANCH}) +. if empty(EC2_SVNBRANCH) EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' . export EC2_SVNBRANCH . endif -. if empty(${EC2_SVNREV}) +. if empty(EC2_SVNREV) EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} . export EC2_SVNREV . endif