svn commit: r205814 - user/dougb/portmaster

[Doug Barton]

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