From owner-svn-src-head@freebsd.org Tue Sep 3 14:06:33 2019 Return-Path: Delivered-To: svn-src-head@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 0E9EEDC9AA; Tue, 3 Sep 2019 14:06:28 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zR3DQ9z4PYx; Tue, 3 Sep 2019 14:06:27 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 3C1871A6AC; Tue, 3 Sep 2019 14:06:08 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 178941DAFD; Mon, 8 Apr 2019 00:08:38 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ED83779E8; Mon, 8 Apr 2019 00:08:37 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0DE451DA92; Mon, 8 Apr 2019 00:08:37 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 33A751DA8E for ; Mon, 8 Apr 2019 00:08:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E7C5D779E0 for ; Mon, 8 Apr 2019 00:08:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id c189so6948511qke.6 for ; Sun, 07 Apr 2019 17:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XC8Md6R4JhyuN6HSXkDxIANAOnaGVhPKM+1LvwF8NzY=; b=NeVT1xsSVZRi6utCheURa4Cl1uH9r2PJsV/tvh14b1lJL8AsAV9NQLtB6VSOBPPEXD 0vltzRoa1TUyzLhHiwglZZfbUl7copERQqZARstJbvp8PjqhIMqcH8i6J5pNbI+do/OQ j9jlXLVj3iohwfiit7EQmZWG84l5GSHtFCvw8xBfqTpXfV11X+q9dJt8xtirvdXKFMpL O/ZPDFmE8NQmXyxFDIsEYcE6vYClHqLWrUPwGqbtdPaZdOqLHtd4k+CVrkzq/1CmbbGe 23xhs5wuQPCd98ZvFObyLrGXPsWhyJRq59lOXFRYNLKO15qBUpjGJcZpgRWwylRivdw/ 1a/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XC8Md6R4JhyuN6HSXkDxIANAOnaGVhPKM+1LvwF8NzY=; b=jKm9exUPe8kLBunPl8+CK6g/ZWNJqf1IooUGhIqoA4AQddaDUPv3Afm/psRgdpA6Fp xOtphfJCRr7gFUdhk1KzKJ4ajBboJhI7oZMeJPkx1/vyNrfj/ZwVEdmShMmhZLcIM1gp swkC2748a6GlIjKowqTAKHVXKZ93yAQl57IztkdaH70e1NkVb9mY68fTa2daamUeLMcb O6VxmGbSFlj2woMUea1cxLPXOMz5hNvn5+M+6MwfeRsMzLDdLy1CS8T1T14IOvBv3njK FU0MT1PBwWAVJU08oTyTUICleWo53i6bE4DZhnzoJFW7L/GF1A5jacAO6MC5mVM/QWNb lC1A== X-Gm-Message-State: APjAAAV1IHmdG9eSROHud7vs0VRDrao+nKy6kqh7Uy14Azc1eE1Wl6Qz Rtm4lps679fPOR+mDTDHAm6CTdgf6MfXV0DHlSultQ== X-Google-Smtp-Source: APXvYqzeGYywS27croiMevH7Rh2ISg1V8cPM6R/jfDr7SpuWaOEFZNd/BygrnGuBcON0dFIwchKpDJoqQRsK3/X6SOM= X-Received: by 2002:a05:620a:1024:: with SMTP id a4mr21117561qkk.232.1554682113091; Sun, 07 Apr 2019 17:08:33 -0700 (PDT) MIME-Version: 1.0 References: <201904071839.x37IduPO002007@repo.freebsd.org> In-Reply-To: From: Warner Losh Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Oliver Pinter Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 4ED83779E8 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:33 -0000 X-Original-Date: Sun, 7 Apr 2019 18:08:21 -0600 X-List-Received-Date: Tue, 03 Sep 2019 14:06:33 -0000 On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter wrote: > Please revert this patch. If I'm not wrong, this will break the > freebsd-version command's generation or output. > You are going to need to be a lot more specific about this. It makes no sense to me at all how any of this could break that. The code is identical logically and produces the same result. Warner On Sunday, April 7, 2019, Warner Losh wrote: > >> Author: imp >> Date: Sun Apr 7 18:39:55 2019 >> New Revision: 346018 >> URL: https://svnweb.freebsd.org/changeset/base/346018 >> >> Log: >> Use default shell assignment rather more complicated if then >> construct. >> >> Discussed with: emaste@, allanjude@ (changes (or not) based on their >> feedback) >> Differential Revision: https://reviews.freebsd.org/D19797 >> >> Modified: >> head/sys/conf/newvers.sh >> >> Modified: head/sys/conf/newvers.sh >> >> ============================================================================== >> --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) >> +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) >> @@ -46,10 +46,7 @@ >> >> TYPE="FreeBSD" >> REVISION="13.0" >> -BRANCH="CURRENT" >> -if [ -n "${BRANCH_OVERRIDE}" ]; then >> - BRANCH=${BRANCH_OVERRIDE} >> -fi >> +BRANCH=${BRANCH_OVERRIDE:-CURRENT} >> RELEASE="${REVISION}-${BRANCH}" >> VERSION="${TYPE} ${RELEASE}" >> >> @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then >> SYSDIR=$(dirname $0)/.. >> fi >> >> -if [ -n "${PARAMFILE}" ]; then >> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print >> $3}' \ >> - ${PARAMFILE}) >> -else >> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print >> $3}' \ >> - ${SYSDIR}/sys/param.h) >> -fi >> +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ >> + ${PARAMFILE:-${SYSDIR}/sys/param.h}) >> >> -b=share/examples/etc/bsd-style-copyright >> if [ -r "${SYSDIR}/../COPYRIGHT" ]; then >> year=$(sed -Ee '/^Copyright .* The FreeBSD >> Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) >> else >> year=$(date +%Y) >> fi >> # look for copyright template >> +b=share/examples/etc/bsd-style-copyright >> for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b >> do >> if [ -r "$bsd_copyright" ]; then >> @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT >> >> # VARS_ONLY means no files should be generated, this is just being >> # included. >> -if [ -n "$VARS_ONLY" ]; then >> - return 0 >> -fi >> +[ -n "$VARS_ONLY" ] && return 0 >> >> LC_ALL=C; export LC_ALL >> if [ ! -r version ] >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >> >