From owner-svn-src-head@freebsd.org Mon Apr 8 00:08:34 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 67592156F411 for ; Mon, 8 Apr 2019 00:08:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (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 D9C38779DF for ; Mon, 8 Apr 2019 00:08:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72c.google.com with SMTP id z76so6923873qkb.12 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=cC/x3mmJzLPraE/w6tJvAO5tBKImNGDi1yr+QLNqmEwmwDnlcOZakfQuOrZDyhIoay F1LjOknJd5wmfB6Z6km4gxmmnpnO+23d/xGSwXhh/fjvhyqrkLuwBLK6G4jq8wIcU0Ex K77y6wyirV9ADEJaHE856uIO0UDDgcivMXmENxwXQsehAZyPs/DdsvAvm7wRuu6yvRHz ml27SNh/CUJDzV7V+NWIAz355XBdetueQKGkNeN60yq16uL7g+V1P9mZ+LQWZtDn6hwC EGA+g5/WfkFLnDsdKGUhykUNxxl6rU3dsdXCJn1UXha7p5QkmMNiAKWucZILHymMrFy3 ScWg== X-Gm-Message-State: APjAAAXl9iUNkCqINQsHbsO0JQGaoWhFZlrraLmo6x70gxRRLIGmR7y7 EcAFLXNLXu9evePb0yOpqK9C3fK++t6kGgHKlKmXD1JG 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 Date: Sun, 7 Apr 2019 18:08:21 -0600 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" X-Rspamd-Queue-Id: D9C38779DF 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_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.983,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: Mon, 08 Apr 2019 00:08:34 -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" >> >