svn commit: r302534 - head/usr.sbin/freebsd-update

[Xin LI]

Author: delphij
Date: Mon Jul 11 03:31:12 2016
New Revision: 302534
URL: https://svnweb.freebsd.org/changeset/base/302534

Log:
  Allow - in distribution names.  This is needed for freebsd-update to work
  with 11.0+, where the debugging symbols use a new naming scheme for release
  distribution files.
  
  Errata candidate.
  
  Approved by:	cperciva
  Differential Revision:	https://reviews.freebsd.org/D7170

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 00:03:39 2016	(r302533)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 03:31:12 2016	(r302534)
@@ -1250,7 +1250,7 @@ fetch_metadata_sanity () {
 
 	# Check that the first four fields make sense.
 	if gunzip -c < files/$1.gz |
-	    grep -qvE "^[a-z]+\|[0-9a-z]+\|${P}+\|[fdL-]\|"; then
+	    grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then
 		fetch_metadata_bogus ""
 		return 1
 	fi