Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Nov 2010 06:23:06 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r215030 - user/dougb/portmaster
Message-ID:  <201011090623.oA96N6v9087769@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011090623.oA96N6v9087769>