From owner-svn-src-user@FreeBSD.ORG  Mon Mar 29 00:23:46 2010
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 ABD7A106566B;
	Mon, 29 Mar 2010 00:23:46 +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 9BF808FC08;
	Mon, 29 Mar 2010 00:23:46 +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 o2T0NkKW090771;
	Mon, 29 Mar 2010 00:23:46 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2T0NkAb090769;
	Mon, 29 Mar 2010 00:23:46 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201003290023.o2T0NkAb090769@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 29 Mar 2010 00:23:46 +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: r205814 - 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: Mon, 29 Mar 2010 00:23:46 -0000

Author: dougb
Date: Mon Mar 29 00:23:46 2010
New Revision: 205814
URL: http://svn.freebsd.org/changeset/base/205814

Log:
  Make the handling of the backup package directory more rational,
  and avoid needless work.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Mar 29 00:14:34 2010	(r205813)
+++ user/dougb/portmaster/portmaster	Mon Mar 29 00:23:46 2010	(r205814)
@@ -1237,13 +1237,13 @@ init_packages_var () {
 
 	PACKAGES=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES 2>/dev/null`
 	if [ -z "$PACKAGES" ]; then
-		if [ -d /usr/ports/packages ]; then
+		if [ -d /usr/ports/packages -a -w /usr/ports/packages ]; then
 			PACKAGES='/usr/ports/packages'
 		else
-			if [ -d /usr/ports/ ]; then
+			if [ -d /usr/ports/ -a -w /usr/ports/ ]; then
 				PACKAGES='/usr/ports/packages'
 			else
-				fail 'The value of PACKAGES cannot be empty'
+fail 'The value of PACKAGES cannot be empty and the directory must be writable'
 			fi
 		fi
 	fi
@@ -1255,16 +1255,16 @@ init_packages () {
 
 	init_packages_var
 
-	if [ -z "$NO_BACKUP" ]; then
-		pbu=$PACKAGES/portmaster-backup
+	[ -n "$NO_BACKUP" ] && return
 
-		if [ ! -d "$pbu" ]; then
-			[ -n "$PM_SU_VERBOSE" ] &&
-				echo "===>>> Creating $pbu"
-			pm_mkdir_s $pbu
-		fi
-		export pbu
+	pbu=$PACKAGES/portmaster-backup
+
+	if [ ! -d "$pbu" ]; then
+		[ -n "$PM_SU_VERBOSE" ] &&
+			echo "===>>> Creating $pbu"
+		pm_mkdir_s $pbu
 	fi
+	export pbu
 }
 
 pm_pkg_create () {
@@ -2379,7 +2379,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 		fi
 	fi
 
-	[ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages
+	[ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages_var
 	[ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE
 
 	# Set the file name here so it's visible to the children