From owner-svn-src-user@FreeBSD.ORG  Fri Dec 18 01:30:11 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 931DA10656A5;
	Fri, 18 Dec 2009 01:30:11 +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 82A248FC1D;
	Fri, 18 Dec 2009 01:30:11 +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 nBI1UB5Y067524;
	Fri, 18 Dec 2009 01:30:11 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI1UBo1067522;
	Fri, 18 Dec 2009 01:30:11 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912180130.nBI1UBo1067522@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 18 Dec 2009 01:30:11 +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: r200661 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Dec 2009 01:30:11 -0000

Author: dougb
Date: Fri Dec 18 01:30:11 2009
New Revision: 200661
URL: http://svn.freebsd.org/changeset/base/200661

Log:
  More robust error-handling for package directory creation in
  pm_pkg_create().
  
  Chase the location on the ftp site for packages likely to work with
  9-current

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Dec 18 01:05:41 2009	(r200660)
+++ user/dougb/portmaster/portmaster	Fri Dec 18 01:30:11 2009	(r200661)
@@ -1126,7 +1126,10 @@ pm_pkg_create () {
 	local pkgdir
 
 	if [ "$1" = "${packages}" ]; then
-		pm_mkdir_s ${1}/All ${1}/Latest ${1}/${portdir%/*}
+		for pkgdir in All Latest ${portdir%/*}; do
+			pm_mkdir_s ${packages}/${pkgdir} ||
+				fail "Cannot mkdir -p $pkgdir"
+		done
 		pkgdir=${packages}/All
 		echo "===>>> Creating a package for new version $2"
 	else
@@ -2518,7 +2521,7 @@ fetch_package () {
 				release=packages-${release%%\.*}-stable ;;
 		[678]\.[0-9]-RELEASE*)
 				release=packages-${release%-RELEASE*}-release ;;
-		9\.0-CURRENT)	release=packages-8-current ;;	# XXX
+		9\.0-CURRENT)	release=packages-8-stable ;;	# XXX
 		*RC[0-9]*)	release=${release%-RC[0-9]}
 				release=packages-${release}-release ;;
 		*BETA[0-9]*)	release=${release%-BETA[0-9]}