From owner-svn-src-user@FreeBSD.ORG  Tue Dec  1 22:18:28 2009
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 1D9DB1065692;
	Tue,  1 Dec 2009 22:18:28 +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 0D95E8FC14;
	Tue,  1 Dec 2009 22:18:28 +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 nB1MIRDH077952;
	Tue, 1 Dec 2009 22:18:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB1MIRLo077950;
	Tue, 1 Dec 2009 22:18:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912012218.nB1MIRLo077950@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 1 Dec 2009 22:18:27 +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: r200002 - 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: Tue, 01 Dec 2009 22:18:28 -0000

Author: dougb
Date: Tue Dec  1 22:18:27 2009
New Revision: 200002
URL: http://svn.freebsd.org/changeset/base/200002

Log:
  Handle the -P option in getopts() to accomodate including it together
  with other options (e.g., -Pav).
  
  On the other hand, add an explicit error for -PP<something else>

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Dec  1 21:54:53 2009	(r200001)
+++ user/dougb/portmaster/portmaster	Tue Dec  1 22:18:27 2009	(r200002)
@@ -411,7 +411,9 @@ e2="The --packages-build option and the 
 
 for var in "$@" ; do
 	case "$var" in
-	-P|--packages)		packages_init first
+	-PP[A-Za-z0-9]*|*[A-Za-z0-9]PP*)
+				fail "The -PP option must stand alone" ;;
+	--packages)		packages_init first
 				PM_PACKAGES=first ; export PM_PACKAGES ;;
 	-PP|--packages-only)	packages_init only
 				PM_PACKAGES=only ; export PM_PACKAGES ;;
@@ -887,7 +889,7 @@ fi
 #=============== End code relevant only to --features ===============
 
 # Save switches for potential child processes
-while getopts 'BCDFGHKLRabde:fghilm:nop:r:stuvwx:' COMMAND_LINE_ARGUMENT ; do
+while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stuvwx:' COMMAND_LINE_ARGUMENT ; do
 	case "${COMMAND_LINE_ARGUMENT}" in
 	B)	NO_BACKUP=Bopt; ARGS="-B $ARGS" ;;
 	C)	DONT_PRE_CLEAN=Copt; ARGS="-C $ARGS" ;;
@@ -897,6 +899,8 @@ while getopts 'BCDFGHKLRabde:fghilm:nop:
 	H)	HIDE_BUILD=Hopt; ARGS="-H $ARGS" ;;
 	K)	DONT_POST_CLEAN=Kopt; ARGS="-K $ARGS" ;;
 	L)	LIST_PLUS=Lopt ;;
+	P)	packages_init first
+		PM_PACKAGES=first ; export PM_PACKAGES ;;
 	R)	RESTART=Ropt ; ARGS="-R $ARGS" ;;
 	a)	UPDATE_ALL=aopt ;;
 	b)	BACKUP=bopt; ARGS="-b $ARGS" ;;