svn commit: r214532 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Fri Oct 29 21:12:44 2010
New Revision: 214532
URL: http://svn.freebsd.org/changeset/base/214532

Log:
  s/MD5_FILE/DISTINFO_FILE/, and assert that the value is present to cause
  an actual error if it is not.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Oct 29 21:06:57 2010	(r214531)
+++ user/dougb/portmaster/portmaster	Fri Oct 29 21:12:44 2010	(r214532)
@@ -877,7 +877,8 @@ read_distinfos () {
 			distinfo="${origin}/distinfo"
 		else
 			pm_cd $origin || continue
-			distinfo=`pm_make -V MD5_FILE`
+			distinfo=`pm_make -V DISTINFO_FILE`
+			[ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
 		fi
 
 		if [ -s "$distinfo" ]; then
@@ -912,7 +913,8 @@ read_distinfos_all () {
 			distinfo="${origin}/distinfo"
 		else
 			pm_cd $origin || continue
-			distinfo=`pm_make -V MD5_FILE`
+			distinfo=`pm_make -V DISTINFO_FILE`
+			[ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
 		fi
 
 		if [ -s "$distinfo" ]; then
@@ -3559,7 +3561,8 @@ if [ -n "$distfiles" ]; then
 	if [ -s distinfo ]; then
 		distinfo=distinfo
 	else
-		distinfo=`pm_make -V MD5_FILE`
+		distinfo=`pm_make -V DISTINFO_FILE`
+		[ -n "$distinfo" ] || fail "No DISTINFO_FILE in $portdir"
 	fi
 
 	dist_list_temp=`pm_mktemp dist_list`