Date: Sat, 1 Jan 2011 07:23:06 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r216868 - user/dougb/portmaster Message-ID: <201101010723.p017N6Q5002693@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101010723.p017N6Q5002693>