From owner-svn-src-head@freebsd.org Sun Apr 7 21:16:53 2019 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 2ABF7156BA14 for ; Sun, 7 Apr 2019 21:16:53 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (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 BA9C473104 for ; Sun, 7 Apr 2019 21:16:52 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yb1-xb2f.google.com with SMTP id b18so4398304yba.12 for ; Sun, 07 Apr 2019 14:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Rtc1TVoHjK6ckspqcZvjJdJXPuRcZb9r7WnDqEe8Ix0=; b=UfhiZ2FLG89/GyQA/JavWN7h73z/hWgOuqh+4ZTdChs+OnXY0SDE8TMlMz5XyysSNQ BQ5a3142rbVouXvO3mvBMzlMyH0tXBPgkINvJl6bKKFX6tr6QtmCLd5i5OkMCZbv5uW2 gYf2OFX6MkfkyuBicwGnXhgFCsfv64GvNuXx7uecWga5fogP1SHDUL1JCrA6fAA6rRBN /5Oibh8/BQIhqSjcngfXBPZFf+D4Y8EhKW5sJpdFXHY8AZY1S5QN3hQG73DdzX/NtMHM 9wFbm1V8iW/OJtGSYBfuCgYd7e0CXUapMfzfQmxHr2y9mU6BopTTAjk+Gmjju33VOM3c oNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Rtc1TVoHjK6ckspqcZvjJdJXPuRcZb9r7WnDqEe8Ix0=; b=ge6LPp1Kjmu/DNRd43Su29rip5TkmbT1RNb+tTY0QovsPHiG3UVJniUpzQkcpvGzDS 7rc0jPBJDcDsFHIl4N7/QNuHGR2FuySaxyxvhrS6j51mHzkdAltqVDj697x7Il37KIPB n2rtiCSQOAEIk7f1HN1UARNN0c9IZ6kclOA/E6ljrQvArQ5AmsNKE6pu9YXwVHUUQg65 0Z3CJtGfKG1KSHqMjRdVWdMm8tSbYjx0U7fpcsDEkC2fGo1vuRH0nBk868QVHja6v72H cOR5pKGcGS56+ERrJjG7I6qHETRw+CC1cpEuB67hxwDT54fHdoPrQJsJpnyLzLp39OZn GA4Q== X-Gm-Message-State: APjAAAXD0UgIi2iLC/aXGAjSVyQaJqEQpxpZ3FtbLlDqzXvHRaYAWLIY an5C67FyRmzO8MRS8/RFIaWwLos2WpYqH2/JIDSfKQ== X-Google-Smtp-Source: APXvYqxKBaOZcRDoWZk+HAvh1oQm/JzuC9Ht/G2dOUDrD2JamDFwxYID0CtlrqbT9KaSJHLyJmi1Roy5KRI6crgPzSo= X-Received: by 2002:a25:4642:: with SMTP id t63mr22507328yba.116.1554671812196; Sun, 07 Apr 2019 14:16:52 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:810e:0:0:0:0:0 with HTTP; Sun, 7 Apr 2019 14:16:51 -0700 (PDT) In-Reply-To: <201904071839.x37IduPO002007@repo.freebsd.org> References: <201904071839.x37IduPO002007@repo.freebsd.org> From: Oliver Pinter Date: Sun, 7 Apr 2019 23:16:51 +0200 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Warner Losh Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: BA9C473104 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] 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 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, 07 Apr 2019 21:16:53 -0000 Please revert this patch. If I'm not wrong, this will break the freebsd-version command's generation or output. 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" >