svn commit: r200002 - user/dougb/portmaster

[Doug Barton]

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" ;;