From owner-svn-src-user@FreeBSD.ORG  Wed Dec  8 08:01:27 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 A11601065679;
	Wed,  8 Dec 2010 08:01:27 +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 91BA28FC13;
	Wed,  8 Dec 2010 08:01:27 +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 oB881RVk095012;
	Wed, 8 Dec 2010 08:01:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB881RAw095010;
	Wed, 8 Dec 2010 08:01:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201012080801.oB881RAw095010@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 8 Dec 2010 08:01: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: r216290 - 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, 08 Dec 2010 08:01:27 -0000

Author: dougb
Date: Wed Dec  8 08:01:27 2010
New Revision: 216290
URL: http://svn.freebsd.org/changeset/base/216290

Log:
  Add a -y option to answer "Yes" to all dialogs that pose a yes/no question
  
  Begin implementation of this feature, and enhanced support for -n in the
  --check-depends feature.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Dec  8 07:32:17 2010	(r216289)
+++ user/dougb/portmaster/portmaster	Wed Dec  8 08:01:27 2010	(r216290)
@@ -528,7 +528,7 @@ set -- $newopts
 unset var newopts
 
 # Save switches for potential child processes
-while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stuvwx:' COMMAND_LINE_ARGUMENT ; do
+while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stuvwx:y' COMMAND_LINE_ARGUMENT ; do
 	case "${COMMAND_LINE_ARGUMENT}" in
 	B)	NO_BACKUP=Bopt; ARGS="-B $ARGS" ;;
 	C)	DONT_PRE_CLEAN=Copt; ARGS="-C $ARGS" ;;
@@ -576,6 +576,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop
 		-*)	fail 'The -x option requires an argument' ;;
 		esac
 		PM_EXCL="${PM_EXCL}`globstrip ${OPTARG}` " ;;
+	y)	PM_YES=yopt; ARGS="-y $ARGS" ;;
 	*)	echo '' ; echo "===>>> Try ${0##*/} --help"; exit 1 ;;
 	esac
 done
@@ -870,10 +871,19 @@ IFS='
 				echo "	===>>> but there is no installed version"
 				echo ''
 				if [ -n "$CHECK_DEPENDS" ]; then
-					echo -n "	===>>> Delete this dependency data? y/n [n] "
-					read answer
+					if [ -z "$PM_YES" -a -z "$NO_ACTION" ]; then
+						echo -n "	===>>> Delete this dependency data? y/n [n] "
+						read answer
+						echo ''
+					else
+						if [ -n "$PM_YES" ]; then
+							answer=y
+						elif [ -n "$NO_ACTION" ]; then
+							answer=n
+						fi
+					fi
 					case "$answer" in
-					[yY]) unset prev_line line ; echo '' ; continue ;;
+					[yY]) unset prev_line line ; continue ;;
 					esac
 				else
 					echo "	===>>> Try ${0##*/} --check-depends"