svn commit: r240805 - head/sys/conf

[Rui Paulo]

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 ;;