From owner-svn-src-head@FreeBSD.ORG  Sat Sep 22 07:44:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 58FD6106564A;
	Sat, 22 Sep 2012 07:44:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 439A58FC12;
	Sat, 22 Sep 2012 07:44:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8M7ibR0018903;
	Sat, 22 Sep 2012 07:44:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8M7ibqS018901;
	Sat, 22 Sep 2012 07:44:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201209220744.q8M7ibqS018901@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 22 Sep 2012 07:44:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240805 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Sep 2012 07:44:37 -0000

Author: rpaulo
Date: Sat Sep 22 07:44:36 2012
New Revision: 240805
URL: http://svn.freebsd.org/changeset/base/240805

Log:
  Improve the check for p4 opened files.
  
  Now we only search for opened files in ${SYSDIR}, which makes it
  possible to use multiple source trees.

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Sat Sep 22 07:27:24 2012	(r240804)
+++ head/sys/conf/newvers.sh	Sat Sep 22 07:44:36 2012	(r240805)
@@ -140,10 +140,10 @@ if [ -n "$p4_cmd" ] ; then
 	case "$p4version" in
 	[0-9]*)
 		p4version=" ${p4version}"
-		p4opened=`$p4_cmd opened 2>&1`
+		p4opened=`cd ${SYSDIR} && $p4_cmd opened ./... 2>&1`
 		case "$p4opened" in
 		File*) ;;
-		*)	p4version="${p4version}+pending" ;;
+		//*)	p4version="${p4version}+edit" ;;
 		esac
 		;;
 	*)	unset p4version ;;