Module Name:    src
Committed By:   apb
Date:           Sat Jun 14 12:35:18 UTC 2014

Modified Files:
        src/sys/conf: newvers.sh

Log Message:
Append ".${BUILDID}" to the default value of <id>,
provided the "-i <id>" command line option was not used.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/conf/newvers.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/conf/newvers.sh
diff -u src/sys/conf/newvers.sh:1.57 src/sys/conf/newvers.sh:1.58
--- src/sys/conf/newvers.sh:1.57	Sun Jan 10 23:55:03 2010
+++ src/sys/conf/newvers.sh	Sat Jun 14 12:35:18 2014
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: newvers.sh,v 1.57 2010/01/10 23:55:03 snj Exp $
+#	$NetBSD: newvers.sh,v 1.58 2014/06/14 12:35:18 apb Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -65,6 +65,13 @@ if [ -z "${id}" ]; then
 	else
 		id=$(basename ${d})
 	fi
+	# Append ".${BUILDID}" to the default value of <id>.
+	# If the "-i <id>" command line option was used then this
+	# branch is not taken, so the command-line value of <id>
+	# is used without change.
+	if [ -n "${BUILDID}" ]; then
+		id="${id}.${BUILDID}"
+	fi
 fi
 
 osrelcmd=${cwd}/osrelease.sh

Reply via email to