From owner-svn-src-head@FreeBSD.ORG  Tue Sep 29 16:26:10 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B926106566C;
	Tue, 29 Sep 2009 16:26:10 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 190078FC14;
	Tue, 29 Sep 2009 16:26:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TGQ9x8089931;
	Tue, 29 Sep 2009 16:26:09 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8TGQ919089929;
	Tue, 29 Sep 2009 16:26:09 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200909291626.n8TGQ919089929@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 29 Sep 2009 16:26:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197618 - head/usr.sbin/freebsd-update
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2009 16:26:10 -0000

Author: cperciva
Date: Tue Sep 29 16:26:09 2009
New Revision: 197618
URL: http://svn.freebsd.org/changeset/base/197618

Log:
  Special-case "-r X" where X is [0-9.]+ to mean "-r X-RELEASE".
  
  Tripped over by:	too many people to count
  MFC after:	1 month

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	Tue Sep 29 16:19:48 2009	(r197617)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Tue Sep 29 16:26:09 2009	(r197618)
@@ -284,6 +284,9 @@ config_TargetRelease () {
 	else
 		return 1
 	fi
+	if echo ${TARGETRELEASE} | grep -qE '^[0-9.]+$'; then
+		TARGETRELEASE="${TARGETRELEASE}-RELEASE"
+	fi
 }
 
 # Define what happens to output of utilities