From owner-svn-src-user@FreeBSD.ORG  Wed Aug 11 06:33:38 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 A3249106568A;
	Wed, 11 Aug 2010 06:33:38 +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 93E9F8FC0A;
	Wed, 11 Aug 2010 06:33:38 +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 o7B6XcOJ065418;
	Wed, 11 Aug 2010 06:33:38 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7B6XcFQ065416;
	Wed, 11 Aug 2010 06:33:38 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008110633.o7B6XcFQ065416@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 11 Aug 2010 06:33:38 +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: r211166 - 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: Wed, 11 Aug 2010 06:33:38 -0000

Author: dougb
Date: Wed Aug 11 06:33:38 2010
New Revision: 211166
URL: http://svn.freebsd.org/changeset/base/211166

Log:
  If using --index-only and neither INDEXDIR nor PORTSDIR are set, set
  INDEXDIR to $TMPDIR so that we can proceed. That makes PACKAGES the
  only variable the user has to set to use --index-only and --packages-only
  with no $PORTSDIR and no ports directory.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Aug 11 06:29:40 2010	(r211165)
+++ user/dougb/portmaster/portmaster	Wed Aug 11 06:33:38 2010	(r211166)
@@ -534,6 +534,9 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
 			INDEXFILE=INDEX-${ver%%\.*}
 			unset ver
 		fi
+
+		[ -z "$INDEXDIR" -a -n "$PM_INDEX_ONLY" -z "$pd" ] && INDEXDIR="$TMPDIR"
+
 		PM_INDEX="${INDEXDIR:-$pd}/${INDEXFILE}"
 
 		if [ -z "$PM_NO_INDEX_FETCH" ]; then