svn commit: r274102 - stable/10/release

[Glen Barber]

Author: gjb
Date: Tue Nov  4 23:02:16 2014
New Revision: 274102
URL: https://svnweb.freebsd.org/changeset/base/274102

Log:
  MFC r274095:
    Fix VOLUME_LABEL when BRANCH contains '-' and '.'
    characters, in particular '-' and '.'.
  
  Insta-MFC ok:	re (hrs)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Tue Nov  4 22:47:51 2014	(r274101)
+++ stable/10/release/Makefile	Tue Nov  4 23:02:16 2014	(r274102)
@@ -56,10 +56,10 @@ ${_V}!=	eval $$(awk '/^${_V}=/{print}' $
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}
-VOLUME_LABEL=	${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
+VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
 .else
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL=	${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
+VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endif
 .endfor
 .endif