svn commit: r216868 - user/dougb/portmaster

[Doug Barton]

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