svn commit: r302539 - stable/11/usr.sbin/freebsd-update

[Xin LI]

Author: delphij
Date: Mon Jul 11 04:50:32 2016
New Revision: 302539
URL: https://svnweb.freebsd.org/changeset/base/302539

Log:
  MFC r302534:
  
  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:	re (gjb)

Modified:
  stable/11/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/11/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 04:21:38 2016	(r302538)
+++ stable/11/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 04:50:32 2016	(r302539)
@@ -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