From owner-svn-src-user@FreeBSD.ORG  Sun Jan 24 02:33:14 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 58190106566C;
	Sun, 24 Jan 2010 02:33:14 +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 4764B8FC0A;
	Sun, 24 Jan 2010 02:33:14 +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 o0O2XEmf091217;
	Sun, 24 Jan 2010 02:33:14 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0O2XEOg091215;
	Sun, 24 Jan 2010 02:33:14 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201001240233.o0O2XEOg091215@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 24 Jan 2010 02:33:14 +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: r202907 - 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: Sun, 24 Jan 2010 02:33:14 -0000

Author: dougb
Date: Sun Jan 24 02:33:14 2010
New Revision: 202907
URL: http://svn.freebsd.org/changeset/base/202907

Log:
  When I was twiddling update_port() previously I forgot to restore
  a test for the presence of the $update_to argument. The effect was
  cosmetic, but needed to be fixed.
  
  In post_config(), simplify some of the new code related to the terminal
  title string, and move a local statement down inside the test where
  the variable will be used.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Jan 24 02:10:23 2010	(r202906)
+++ user/dougb/portmaster/portmaster	Sun Jan 24 02:33:14 2010	(r202907)
@@ -1685,7 +1685,7 @@ update_build_l () {
 update_port () {
 	local update_to
 
-	update_to=" to $2"
+	[ -n "$2" ] && update_to=" to $2"
 	echo "===>>> Launching child to update ${1#$pd/}${update_to}"
 
 	dep_of_deps=$(( $dep_of_deps + 1 ))
@@ -1944,13 +1944,14 @@ create_master_rb_list () {
 }
 
 post_config () {
-	local numdeps answer action
+	local action
 
 	if [ $num_of_deps -gt 0 ]; then
-		numdeps=" (${num_of_deps})"
-		term_printf "$numdeps"
+		term_printf " (${num_of_deps})"
 
 		if [ -z "$PM_NO_CONFIRM" ]; then
+			local answer
+
 			echo ''
 echo "===>>> The following actions will be taken if you choose to proceed:"
 			echo -e "$build_l"