summaryrefslogtreecommitdiffstats
path: root/sys/conf/newvers.sh
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2012-09-22 07:44:36 +0000
committerrpaulo <rpaulo@FreeBSD.org>2012-09-22 07:44:36 +0000
commit082ae1b42fe7b44ffad1901b7be918f6c724f244 (patch)
treec542b02456cae63bfeef4d4be92e217c136352d9 /sys/conf/newvers.sh
parentbcd6a2054007cb273e3c02979e880d593f2d63e3 (diff)
downloadFreeBSD-src-082ae1b42fe7b44ffad1901b7be918f6c724f244.zip
FreeBSD-src-082ae1b42fe7b44ffad1901b7be918f6c724f244.tar.gz
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.
Diffstat (limited to 'sys/conf/newvers.sh')
-rw-r--r--sys/conf/newvers.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5a4f13e..3cb211b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -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 ;;
OpenPOWER on IntegriCloud