From owner-svn-src-projects@freebsd.org Thu Aug 27 14:29:07 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40E643B470B for ; Thu, 27 Aug 2020 14:29:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BclTv0tfgz3T6Y; Thu, 27 Aug 2020 14:29:07 +0000 (UTC) (envelope-from gjb@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 0069D25709; Thu, 27 Aug 2020 14:29:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07RET6tL052863; Thu, 27 Aug 2020 14:29:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07RET6LT052862; Thu, 27 Aug 2020 14:29:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202008271429.07RET6LT052862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 27 Aug 2020 14:29:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364866 - projects/release-git/release X-SVN-Group: projects X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: projects/release-git/release X-SVN-Commit-Revision: 364866 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 14:29:07 -0000 Author: gjb Date: Thu Aug 27 14:29:06 2020 New Revision: 364866 URL: https://svnweb.freebsd.org/changeset/base/364866 Log: Do not unconditionally build git from ports if it already exists. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: projects/release-git/release/release.sh Modified: projects/release-git/release/release.sh ============================================================================== --- projects/release-git/release/release.sh Thu Aug 27 13:38:20 2020 (r364865) +++ projects/release-git/release/release.sh Thu Aug 27 14:29:06 2020 (r364866) @@ -265,7 +265,8 @@ extra_chroot_setup() { # Install git from ports or packages if the ports tree is # available and VCSCMD is unset. - if [ -d ${CHROOTDIR}/usr/ports ]; then + _gitcmd="$(which git)" + if [ -d ${CHROOTDIR}/usr/ports -a ! -z "${_gitcmd}" ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)