From owner-svn-src-user@FreeBSD.ORG  Fri Apr 29 03:16:15 2011
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 85251106564A;
	Fri, 29 Apr 2011 03:16:15 +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 748408FC19;
	Fri, 29 Apr 2011 03:16:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3T3GFl0080711;
	Fri, 29 Apr 2011 03:16:15 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3T3GF3Y080709;
	Fri, 29 Apr 2011 03:16:15 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104290316.p3T3GF3Y080709@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 29 Apr 2011 03:16:15 +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: r221195 - 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: Fri, 29 Apr 2011 03:16:15 -0000

Author: dougb
Date: Fri Apr 29 03:16:15 2011
New Revision: 221195
URL: http://svn.freebsd.org/changeset/base/221195

Log:
  Recursive irony alert:
  When called from gen_dep_list, which also uses temp_list as a local
  variable, uniquify_list needs its own set of local variables otherwise
  temp_list ends up being duplicated by uniquify_list
  
  Continue the campaign to unset things to keep the environment small

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Apr 29 01:14:12 2011	(r221194)
+++ user/dougb/portmaster/portmaster	Fri Apr 29 03:16:15 2011	(r221195)
@@ -2284,16 +2284,16 @@ update_port () {
 }
 
 uniquify_list () {
-	local item temp_list
+	local ul_item ul_temp_list
 
-	for item in "$@"; do
-		case "$temp_list" in
-		*" $item "*) ;;
-		*)	temp_list=" $temp_list $item " ;;
+	for ul_item in "$@"; do
+		case "$ul_temp_list" in
+		*" $ul_item "*) ;;
+		*)	ul_temp_list=" $ul_temp_list $ul_item " ;;
 		esac
 	done
 
-	echo $temp_list
+	echo $ul_temp_list
 }
 
 clean_build_only_list () {
@@ -2989,6 +2989,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then
 		esac
 		unset glob_dirs
 	fi
+	unset argv
 else
 	portdir="${1#$pd/}" ; portdir="${portdir%/}"
 	if [ -z "$PM_INDEX_ONLY" ]; then
@@ -3217,6 +3218,7 @@ if [ -n "$PM_FIRST_PASS" ]; then
 	fi
 
 	dependency_check "$dep_check_type"
+# XXX
 
 	[ -n "$UPDATE_REQ_BYS" -o -n "$URB_YES" ] &&
 		URB_DONE_LIST="${URB_DONE_LIST}${upg_port}:"
@@ -3814,6 +3816,7 @@ if [ -n "$upg_port" ]; then
 	else
 		ilist="Re-installation of $upg_port"
 	fi
+	unset argv
 else
 	ilist="Installation of $portdir ($new_port)"
 fi