svn commit: r287368 - head/release

[Glen Barber]

Author: gjb
Date: Tue Sep  1 15:28:35 2015
New Revision: 287368
URL: https://svnweb.freebsd.org/changeset/base/287368

Log:
  Remove '-' separating OSRELEASE and SNAPSHOT_DATE for vagrant
  builds, and prepend it to SNAPSHOT_DATE to prevent a trailing '-'
  in the final box name for a release build.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.vagrant

Modified: head/release/Makefile.vagrant
==============================================================================
--- head/release/Makefile.vagrant	Tue Sep  1 15:26:21 2015	(r287367)
+++ head/release/Makefile.vagrant	Tue Sep  1 15:28:35 2015	(r287368)
@@ -17,11 +17,11 @@ ATLAS${VAR}:=		${VAGRANT${VAR}}
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +%Y%m%d
+SNAPSHOT_DATE!=		date +-%Y%m%d
 .endif
 
 VAGRANT_VERSION!=	date +%Y.%m.%d
-VAGRANT_TARGET:=	${OSRELEASE}-${SNAPSHOT_DATE}
+VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}
 .if !empty(CLOUDWARE)
 . for _PROVIDER in ${CLOUDWARE}
 .  if ${_PROVIDER:MVAGRANT*}