Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Jul 2016 04:12:16 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r302537 - stable/9/usr.sbin/freebsd-update
Message-ID:  <201607110412.u6B4CGaP095722@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Mon Jul 11 04:12:15 2016
New Revision: 302537
URL: https://svnweb.freebsd.org/changeset/base/302537

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.

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

Modified: stable/9/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/9/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 04:11:33 2016	(r302536)
+++ stable/9/usr.sbin/freebsd-update/freebsd-update.sh	Mon Jul 11 04:12:15 2016	(r302537)
@@ -1229,7 +1229,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607110412.u6B4CGaP095722>