From owner-svn-src-user@FreeBSD.ORG  Sat Jan  1 07:23:06 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 A5D4D106566B;
	Sat,  1 Jan 2011 07:23:06 +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 95D6F8FC0C;
	Sat,  1 Jan 2011 07:23:06 +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 p017N63m002695;
	Sat, 1 Jan 2011 07:23:06 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p017N6Q5002693;
	Sat, 1 Jan 2011 07:23:06 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201101010723.p017N6Q5002693@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 1 Jan 2011 07:23:06 +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: r216868 - 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: Sat, 01 Jan 2011 07:23:06 -0000

Author: dougb
Date: Sat Jan  1 07:23:06 2011
New Revision: 216868
URL: http://svn.freebsd.org/changeset/base/216868

Log:
  Make handling of DI_FILES consistent

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jan  1 06:54:21 2011	(r216867)
+++ user/dougb/portmaster/portmaster	Sat Jan  1 07:23:06 2011	(r216868)
@@ -1723,7 +1723,7 @@ find_and_delete_distfiles () {
 			distfiles_checked="${distfiles_checked}${file}:"
 			pm_v "===>>> Keeping current distfile: $file"
 			continue ;;	# Do not delete current version
-		*)	if [ -e "$DI_FILES" ]; then
+		*)	if [ -s "$DI_FILES" ]; then
 				grep -ql ${ps}$file $DI_FILES && continue
 			fi
 
@@ -3630,7 +3630,7 @@ if [ -n "$distfiles" ]; then
 		echo "DISTFILE:${ds}${file}:SIZE=${size##* }:SHA256=${sha256##* }" \
 		    >> $dist_list_temp
 		# Make sure any new distfiles get added to the list
-		[ -z "$DONT_SCRUB_DISTFILES" -a ! "$$" -eq "$PM_PARENT_PID" ] &&
+		[ -n "$DI_FILES" -a ! "$$" -eq "$PM_PARENT_PID" ] &&
 			echo "${ds}$file" >> $DI_FILES
 	done