From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:31:45 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9473F1065672; Sat, 1 Jan 2011 01:31:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 84B498FC18; Sat, 1 Jan 2011 01:31:45 +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 p011Vj0Z094556; Sat, 1 Jan 2011 01:31:45 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p011VjDr094554; Sat, 1 Jan 2011 01:31:45 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010131.p011VjDr094554@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 01:31:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216866 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:31:45 -0000 Author: dougb Date: Sat Jan 1 01:31:45 2011 New Revision: 216866 URL: http://svn.freebsd.org/changeset/base/216866 Log: When we enter -PRERELEASE phase the package-finding code should still be looking at -stable. Reported by: Jakub Lach Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:26:26 2011 (r216865) +++ user/dougb/portmaster/portmaster Sat Jan 1 01:31:45 2011 (r216866) @@ -3272,7 +3272,7 @@ fetch_package () { release=`uname -r` case "$release" in - [678]\.[0-9]-STABLE) + [678]\.[0-9]-STABLE|[678]\.[0-9]-PRERELEASE) release=packages-${release%%\.*}-stable ;; [678]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;;