From owner-svn-src-user@FreeBSD.ORG  Sun Jul 22 07:52:59 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4E1F5106566B;
	Sun, 22 Jul 2012 07:52:59 +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 39D148FC12;
	Sun, 22 Jul 2012 07:52:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6M7qxVQ052430;
	Sun, 22 Jul 2012 07:52:59 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6M7qxmG052428;
	Sun, 22 Jul 2012 07:52:59 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201207220752.q6M7qxmG052428@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 22 Jul 2012 07:52:59 +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: r238680 - 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: Sun, 22 Jul 2012 07:52:59 -0000

Author: dougb
Date: Sun Jul 22 07:52:58 2012
New Revision: 238680
URL: http://svn.freebsd.org/changeset/base/238680

Log:
  More minor code cleanups

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Jul 22 00:44:22 2012	(r238679)
+++ user/dougb/portmaster/portmaster	Sun Jul 22 07:52:58 2012	(r238680)
@@ -753,7 +753,7 @@ test_command_line () {
 }
 
 # Error checking for getopts
-[ -n "$PM_FORCE" -a "$INTERACTIVE_UPDATE" ] &&
+[ -n "$PM_FORCE" -a -n "$INTERACTIVE_UPDATE" ] &&
 	fail "The -f and -i options are mutually exclusive"
 if [ -n "$BACKUP" -a -n "$NO_BACKUP" ]; then
 	test_command_line NO_BACKUP BACKUP ||
@@ -2943,7 +2943,8 @@ make_config () {
 if [ "$$" -eq "$PM_PARENT_PID" -a -z "$SHOW_WORK" ]; then
 	CUR_DEPS=':' ; DISPLAY_LIST='' ; INSTALLED_LIST=''
 	PM_DEPTH='' ; pm_mktemp IPC_SAVE ; IPC_SAVE=$pm_mktemp_file
-	export CUR_DEPS DISPLAY_LIST INSTALLED_LIST PM_DEPTH IPC_SAVE
+	PM_FIRST_PASS=pm_first_pass ; PM_NEEDS_UPDATE=' '	# Used with -F for multiport and -a
+	export CUR_DEPS DISPLAY_LIST INSTALLED_LIST PM_DEPTH IPC_SAVE PM_FIRST_PASS PM_NEEDS_UPDATE
 
 	if [ -n "$LOCALBASE" ]; then
 		LOCALBASE_COMPAT="$LOCALBASE/lib/compat/pkg"
@@ -2986,9 +2987,6 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 		fi
 	fi
 
-	PM_FIRST_PASS=pm_first_pass ; export PM_FIRST_PASS
-	PM_NEEDS_UPDATE=' ' ; export PM_NEEDS_UPDATE	# Used with -F for multiport and -a
-
 	if [ -z "$FETCH_ONLY" ]; then
 		NO_DEP_UPDATES=no_dep_updates ; build_l=''
 		export NO_DEP_UPDATES build_l