From owner-svn-src-all@FreeBSD.ORG Tue Nov 4 14:56:06 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2173A34; Tue, 4 Nov 2014 14:56:06 +0000 (UTC) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id A1981E0A; Tue, 4 Nov 2014 14:56:06 +0000 (UTC) Received: from nine.des.no (smtp.des.no [194.63.250.102]) by smtp-int.des.no (Postfix) with ESMTP id 41CC5A3F3; Tue, 4 Nov 2014 14:56:05 +0000 (UTC) Received: by nine.des.no (Postfix, from userid 1001) id 1D04B10D21; Tue, 4 Nov 2014 15:56:05 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Glen Barber Subject: Re: svn commit: r273653 - head/release References: <201410260141.s9Q1ft59057852@svn.freebsd.org> <86mw8710z7.fsf@nine.des.no> Date: Tue, 04 Nov 2014 15:56:05 +0100 In-Reply-To: <86mw8710z7.fsf@nine.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8r?= =?utf-8?Q?grav=22's?= message of "Tue, 04 Nov 2014 15:42:20 +0100") Message-ID: <86fvdz10ca.fsf@nine.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 14:56:07 -0000 Dag-Erling Sm=C3=B8rgrav writes: > Index: release/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- release/Makefile.orig > +++ release/Makefile > @@ -56,10 +56,10 @@ > .for _V in ${TARGET_ARCH} > .if !empty(TARGET:M${_V}) > OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET} > -VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET} > +VOLUME_LABEL=3D ${REVISION:C/[-\.]/_/g:}_${BRANCH}_${TARGET} > .else > OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH} > -VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH} > +VOLUME_LABEL=3D ${REVISION:C/[-\.]/_/g:}_${BRANCH}_${TARGET_ARCH} > .endif > .endfor > .endif Wait, this isn't right. You have to apply the same transformation to ${BRANCH}. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no