Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Apr 2010 04:03:45 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r207183 - user/dougb/portmaster
Message-ID:  <201004250403.o3P43j4r039515@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sun Apr 25 04:03:45 2010
New Revision: 207183
URL: http://svn.freebsd.org/changeset/base/207183

Log:
  In check_for move some local variables down into the block where they
  are used.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Apr 25 03:49:43 2010	(r207182)
+++ user/dougb/portmaster/portmaster	Sun Apr 25 04:03:45 2010	(r207183)
@@ -2067,7 +2067,7 @@ dependency_check () {
 		clean_build_only_list
 	fi
 
-	local d_port origin iport conflicts glob confl_p udf
+	local d_port origin iport udf
 
 	# Do not export, for THIS parent process only
 	[ -n "$CONFIG_ONLY" ] && doing_dep_check=doing_dep_check
@@ -2094,6 +2094,8 @@ dependency_check () {
 			case "$CUR_DEPS" in *:${origin}:*) continue ;; esac
 
 		if [ -z "$PM_INDEX_ONLY" ]; then
+			local conflicts glob confl_p
+
 			conflicts=''
 			if pm_cd $d_port; then
 				grep -ql ^CONFLICTS Makefile &&



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004250403.o3P43j4r039515>