From owner-svn-src-user@FreeBSD.ORG  Tue Nov  9 06:23:06 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 BCC43106564A;
	Tue,  9 Nov 2010 06: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 ABE9E8FC18;
	Tue,  9 Nov 2010 06: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 oA96N6J2087771;
	Tue, 9 Nov 2010 06: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 oA96N6v9087769;
	Tue, 9 Nov 2010 06:23:06 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201011090623.oA96N6v9087769@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 9 Nov 2010 06: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: r215030 - 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: Tue, 09 Nov 2010 06:23:06 -0000

Author: dougb
Date: Tue Nov  9 06:23:06 2010
New Revision: 215030
URL: http://svn.freebsd.org/changeset/base/215030

Log:
  In read_distinfos_all() a missing DISTINFO_FILE doesn't need to be fatal
  like it does in read_distinfos() since it could be caused by something
  uninteresting like a MASTERDIR that exists in part of the tree that has
  not been downloaded (e.g., a c[v]sup refuse file). Add some whitespace
  around the message in case make also emits an error.
  
  For --clean-distfiles* add a line after the "Checking" message to
  make the spacing consistent

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Nov  9 05:28:07 2010	(r215029)
+++ user/dougb/portmaster/portmaster	Tue Nov  9 06:23:06 2010	(r215030)
@@ -932,7 +932,8 @@ read_distinfos_all () {
 		else
 			pm_cd $origin || continue
 			distinfo=`pm_make -V DISTINFO_FILE`
-			[ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
+			[ -n "$distinfo" ] ||
+				{ echo ''; echo "===>>> No DISTINFO_FILE in $origin"; echo ''; }
 		fi
 
 		if [ -s "$distinfo" ]; then
@@ -1064,7 +1065,7 @@ if [ -n "$CLEAN_DISTFILES" ]; then
 		read_distinfos_all
 	fi
 
-	echo "===>>> Checking for stale distfiles"
+	echo "===>>> Checking for stale distfiles" ; echo ''
 	for df in `find $DISTDIR -type f | sort`; do
 		f=${df#$DISTDIR}
 		if ! grep -ql $f $DI_FILES; then