From owner-svn-src-user@FreeBSD.ORG  Fri May  7 18:22:52 2010
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 24671106566B;
	Fri,  7 May 2010 18:22:52 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 152BC8FC18;
	Fri,  7 May 2010 18:22:52 +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 o47IMpRS074213;
	Fri, 7 May 2010 18:22:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o47IMpJQ074211;
	Fri, 7 May 2010 18:22:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005071822.o47IMpJQ074211@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 7 May 2010 18:22:51 +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: r207751 - 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, 07 May 2010 18:22:52 -0000

Author: dougb
Date: Fri May  7 18:22:51 2010
New Revision: 207751
URL: http://svn.freebsd.org/changeset/base/207751

Log:
  Fix a braino for --index-first and --index-only ... the cross-checking of
  the command line options needs to happen before the environment variables
  are set.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri May  7 18:03:35 2010	(r207750)
+++ user/dougb/portmaster/portmaster	Fri May  7 18:22:51 2010	(r207751)
@@ -454,10 +454,12 @@ for var in "$@" ; do
 				export PM_NO_TERM_TITLE ;;
 	--no-index-fetch)	PM_NO_INDEX_FETCH=pm_no_index_fetch ;;
 	--index)		cross_idx index ; PM_INDEX=pm_index ; export PM_INDEX ;;
-	--index-first)		PM_INDEX=pm_index ; PM_INDEX_FIRST=pm_index_first
-				cross_idx first ; export PM_INDEX PM_INDEX_FIRST ;;
-	--index-only)		PM_INDEX=pm_index ; PM_INDEX_ONLY=pm_index_only
-				cross_idx only ; export PM_INDEX PM_INDEX_ONLY ;;
+	--index-first)		cross_idx first ; PM_INDEX=pm_index
+				PM_INDEX_FIRST=pm_index_first
+				export PM_INDEX PM_INDEX_FIRST ;;
+	--index-only)		cross_idx only ; PM_INDEX=pm_index
+				PM_INDEX_ONLY=pm_index_only
+				export PM_INDEX PM_INDEX_ONLY ;;
 	--help)			usage 0 ;;
 	--version)		version ; exit 0 ;;
 	--clean-distfiles)	CLEAN_DISTFILES=clean_distfiles ;;