From owner-freebsd-current@FreeBSD.ORG Tue Oct 25 19:43:49 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6E40106564A; Tue, 25 Oct 2011 19:43:49 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by mx1.freebsd.org (Postfix) with ESMTP id 446C78FC08; Tue, 25 Oct 2011 19:43:48 +0000 (UTC) Received: by bkas6 with SMTP id s6so1367524bka.17 for ; Tue, 25 Oct 2011 12:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=0eRWoQQ7XxGDmGQE78aSqU7BzkC9KQV3Usbj0s7H9dw=; b=jNYCBN181i1rLDezKYVEh4AWpwB1ihuidL8mxucUyQFMDQSYpBr51Bpafii6bUDylu Y5dtwGiY7Gx44Fgr/jMLsD+XdS/3KMfnv/F+y9qKdjSfdBWIaTc5BU0P5rr3y6imzfN2 kk5e90GGgq3HbnfrXE1jkDm54JZeO6336qwMc= MIME-Version: 1.0 Received: by 10.204.7.199 with SMTP id e7mr21572747bke.40.1319571827833; Tue, 25 Oct 2011 12:43:47 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.39.12 with HTTP; Tue, 25 Oct 2011 12:43:47 -0700 (PDT) In-Reply-To: <20111025140000.GA8559@albert.catwhisker.org> References: <20111020114844.GK59810@albert.catwhisker.org> <20111020122121.GL59810@albert.catwhisker.org> <201110211636.05917.jhb@freebsd.org> <20111025140000.GA8559@albert.catwhisker.org> Date: Tue, 25 Oct 2011 12:43:47 -0700 X-Google-Sender-Auth: mApIoKEwOyvA-XaxO-mY_z0Q_Fo Message-ID: From: Craig Rodrigues To: David Wolfskill Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 19:43:50 -0000 On Tue, Oct 25, 2011 at 7:00 AM, David Wolfskill wro= te: > Index: sys/conf/newvers.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- sys/conf/newvers.sh (revision 226724) > +++ sys/conf/newvers.sh (working copy) > @@ -88,7 +88,7 @@ > =A0i=3D`${MAKE:-make} -V KERN_IDENT` > > =A0for dir in /bin /usr/bin /usr/local/bin; do > - =A0 =A0 =A0 if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then > + =A0 =A0 =A0 if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -= x "${dir}/svnversion" ] ; then > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0svnversion=3D${dir}/svnversion > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break > =A0 =A0 =A0 =A0fi > > then? =A0That should preserve current behavior for the case you & Jilles > expressed concern about, while repairing the currently-broken default > case. > > I believe it's in the interest of the project to have that default > case working again (at least) in time for 9.0-RELEASE. > > Please. > >> .... > > I'm staying out of the "svnversion vs. svn info" branch of the thread. > > Peace, > david > -- > David H. Wolfskill =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0david@catwhisker.org > Depriving a girl or boy of an opportunity for education is evil. > > See http://www.catwhisker.org/~david/publickey.gpg for my public key. Hi, I know that Doug disagreed with me on this, but I think this would be easier to implement in the short term: for dir in /bin /usr/bin /usr/local/bin; do if [ -x "${dir}/svnversion" -a -x "${dir}/svn" ]; then ${dir}/svn info ${SRCDIR}/sys > /dev/null 2>&1 if [ $? -eq 0 ]; then svnversion=3D${dir}/svnversion fi fi done The alternative would be to run ${dir}/svnversion, and check the output of that command, making sure that the output starts with a number. --=20 Craig Rodrigues rodrigc@crodrigues.org