From owner-svn-src-user@FreeBSD.ORG  Fri Jun 11 08:13: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 0E9161065676;
	Fri, 11 Jun 2010 08:13:27 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F33B78FC16;
	Fri, 11 Jun 2010 08:13:26 +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 o5B8DQta015727;
	Fri, 11 Jun 2010 08:13:26 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5B8DQJc015726;
	Fri, 11 Jun 2010 08:13:26 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201006110813.o5B8DQJc015726@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 11 Jun 2010 08:13:26 +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: r209036 - 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, 11 Jun 2010 08:13:27 -0000

Author: dougb
Date: Fri Jun 11 08:13:26 2010
New Revision: 209036
URL: http://svn.freebsd.org/changeset/base/209036

Log:
  In delete_all_distfiles() when there is no $origin (such as when a port
  has moved) but there IS a /var/db/ports/<portname>/distfiles, we do not
  want to prompt the user if they are using -d, we just want to delete
  the files.
  
  In the code to strip a port from $build_l if the user chose not to
  update a port that has an +IGNOREME file, the backslash in "\t" needs
  to be escaped.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Jun 11 06:04:14 2010	(r209035)
+++ user/dougb/portmaster/portmaster	Fri Jun 11 08:13:26 2010	(r209036)
@@ -1648,9 +1648,16 @@ delete_all_distfiles () {
 	echo "       Try ${0##*/} --clean-distfiles[-all] for a full cleanup"
 		echo ''
 		if [ -n "$dist_list_files" ]; then
-			echo "===>>> However, the list of files in $dist_list"
-	echo -n "       should be current.  Delete the files on this list? y/n [n] "
-			local answer f ; read answer
+			local answer f
+	# Outdent
+	if [ -z "$ALWAYS_SCRUB_DISTFILES" ]; then
+		echo "===>>> However, the list of files in $dist_list"
+		echo -n "       should be current.  Delete the files on this list? y/n [n] "
+		read answer
+	else
+		answer=y
+	fi
+	# Outdent
 			case "$answer" in
 			[yY])	for f in $dist_list_files; do
 					if [ -f "${DISTDIR}${f}" ]; then
@@ -2756,7 +2763,7 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th
 				dep_of_deps=$(( $dep_of_deps - 1 ))
 				if [ -n "$CONFIG_ONLY" ]; then
 					num_of_deps=$(( $num_of_deps - 1 ))
-					build_l="${build_l%\t*}"
+					build_l="${build_l%\\t*}"
 				fi
 			fi
 			# Outdent