From owner-svn-src-stable@freebsd.org  Thu Sep 17 16:09:38 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 BF1EC3E565C;
 Thu, 17 Sep 2020 16:09:38 +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 4BshkB4jgqz4Dk5;
 Thu, 17 Sep 2020 16:09:38 +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 867C3C9B5;
 Thu, 17 Sep 2020 16:09:38 +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 08HG9cCe017198;
 Thu, 17 Sep 2020 16:09:38 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08HG9cb0017197;
 Thu, 17 Sep 2020 16:09:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202009171609.08HG9cb0017197@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 17 Sep 2020 16:09:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r365838 - stable/12/sys/conf
X-SVN-Group: stable-12
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: stable/12/sys/conf
X-SVN-Commit-Revision: 365838
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2020 16:09:38 -0000

Author: gjb
Date: Thu Sep 17 16:09:38 2020
New Revision: 365838
URL: https://svnweb.freebsd.org/changeset/base/365838

Log:
  MFC r365646, r365720:
   r365646:
    Enclose BRANCH_OVERRIDE in quotes in order to fix an issue with
    freebsd-update(8) builds, where BRANCH is suffixed with -p0 for
    builds.
  
   r365720 (gordon):
    Partially revert r346018 and use the if/then construct instead of
    shell.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  stable/12/sys/conf/newvers.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Thu Sep 17 15:58:42 2020	(r365837)
+++ stable/12/sys/conf/newvers.sh	Thu Sep 17 16:09:38 2020	(r365838)
@@ -49,7 +49,10 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH=${BRANCH_OVERRIDE:-STABLE}
+BRANCH="STABLE"
+if [ -n "${BRANCH_OVERRIDE}" ]; then
+	BRANCH=${BRANCH_OVERRIDE}
+fi
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"