From owner-svn-src-user@FreeBSD.ORG  Fri Oct 29 21:12:44 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 A95AE1065670;
	Fri, 29 Oct 2010 21:12:44 +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 982958FC08;
	Fri, 29 Oct 2010 21:12:44 +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 o9TLCiGo058009;
	Fri, 29 Oct 2010 21:12:44 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9TLCiZD058007;
	Fri, 29 Oct 2010 21:12:44 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201010292112.o9TLCiZD058007@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 29 Oct 2010 21:12:44 +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: r214532 - 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, 29 Oct 2010 21:12:44 -0000

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`