From owner-freebsd-bugs@FreeBSD.ORG  Fri Jun 21 06:10:01 2013
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id AD31331C
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Fri, 21 Jun 2013 06:10:01 +0000 (UTC)
 (envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B5821B19
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Fri, 21 Jun 2013 06:10:01 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5L6A1Vv038542
 for <freebsd-bugs@freefall.freebsd.org>; Fri, 21 Jun 2013 06:10:01 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5L6A1Mj038541;
 Fri, 21 Jun 2013 06:10:01 GMT (envelope-from gnats)
Resent-Date: Fri, 21 Jun 2013 06:10:01 GMT
Resent-Message-Id: <201306210610.r5L6A1Mj038541@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
 "Sergey V. Dyatko" <sergey.dyatko@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7FD072B5
 for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Jun 2013 06:03:50 +0000 (UTC)
 (envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
 by mx1.freebsd.org (Postfix) with ESMTP id 732D51AE9
 for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Jun 2013 06:03:50 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
 by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5L63nmB093631
 for <freebsd-gnats-submit@FreeBSD.org>; Fri, 21 Jun 2013 06:03:49 GMT
 (envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
 by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5L63nk2093497;
 Fri, 21 Jun 2013 06:03:49 GMT (envelope-from nobody)
Message-Id: <201306210603.r5L63nk2093497@oldred.freebsd.org>
Date: Fri, 21 Jun 2013 06:03:49 GMT
From: "Sergey V. Dyatko" <sergey.dyatko@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: bin/179800: [patch] use svnlite on newvers.sh
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Jun 2013 06:10:01 -0000


>Number:         179800
>Category:       bin
>Synopsis:       [patch] use svnlite on newvers.sh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 21 06:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Sergey V. Dyatko
>Release:        HEAD
>Organization:
>Environment:
FreeBSD tiger.minsk.domain 10.0-CURRENT FreeBSD 10.0-CURRENT #20 r251896:251900M: Tue Jun 18 12:29:44 FET 2013     root@tiger.minsk.domain:/usr/obj/usr/src/sys/tiger-desktop  amd64

>Description:
seems strange to me import svnlite and not even try to use it on newvers.sh:)

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(revision 252052)
+++ sys/conf/newvers.sh	(working copy)
@@ -88,14 +88,17 @@
 i=`${MAKE:-make} -V KERN_IDENT`
 compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
 
-for dir in /bin /usr/bin /usr/local/bin; do
-	if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then
-		svnversion=${dir}/svnversion
-	fi
-	if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
-		p4_cmd=${dir}/p4
-	fi
+for svncmd in svnliteversion svnversion; do
+	for dir in /bin /usr/bin /usr/local/bin; do
+		if [ -x "${dir}/${svncmd}" ] && [ -z ${svnversion} ] ; then
+			svnversion=${dir}/${svncmd}
+		fi
+		if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
+			p4_cmd=${dir}/p4
+		fi
+	done
 done
+
 if [ -d "${SYSDIR}/../.git" ] ; then
 	for dir in /bin /usr/bin /usr/local/bin; do
 		if [ -x "${dir}/git" ] ; then


>Release-Note:
>Audit-Trail:
>Unformatted: