From owner-svn-src-all@FreeBSD.ORG  Tue Nov 23 21:21:56 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DB25106564A;
	Tue, 23 Nov 2010 21:21:56 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C2008FC14;
	Tue, 23 Nov 2010 21:21:56 +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 oANLLuiR044262;
	Tue, 23 Nov 2010 21:21:56 GMT (envelope-from phk@svn.freebsd.org)
Received: (from phk@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oANLLuDc044260;
	Tue, 23 Nov 2010 21:21:56 GMT (envelope-from phk@svn.freebsd.org)
Message-Id: <201011232121.oANLLuDc044260@svn.freebsd.org>
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 23 Nov 2010 21:21:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215770 - head/tools/tools/sysbuild
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Nov 2010 21:21:56 -0000

Author: phk
Date: Tue Nov 23 21:21:56 2010
New Revision: 215770
URL: http://svn.freebsd.org/changeset/base/215770

Log:
  Don't checksum distfiles twice if they match the first time.

Modified:
  head/tools/tools/sysbuild/sysbuild.sh

Modified: head/tools/tools/sysbuild/sysbuild.sh
==============================================================================
--- head/tools/tools/sysbuild/sysbuild.sh	Tue Nov 23 21:20:27 2010	(r215769)
+++ head/tools/tools/sysbuild/sysbuild.sh	Tue Nov 23 21:21:56 2010	(r215770)
@@ -253,26 +253,24 @@ ports_prefetch() (
 	# Now checksump/fetch them
 	for p in `cat /tmp/_.plist`
 	do
-		echo "Prefetching $p" >> /mnt/_.prefetch
 		b=`echo $p | tr / _`
 		(
 			cd $p
 			if make checksum $PORTS_OPTS ; then
-				true
-			else
-				make distclean
-				make checksum $PORTS_OPTS || true
+				rm -f /mnt/_.prefetch.$b
+				echo "OK $p" >> /mnt/_.prefetch
+				exit 0
 			fi
-		) > /mnt/_.prefetch.$b 2>&1
-		(
-			cd $p
+			make distclean
+			make checksum $PORTS_OPTS || true
+
 			if make checksum $PORTS_OPTS > /dev/null 2>&1 ; then
 				rm -f /mnt/_.prefetch.$b
 				echo "OK $p" >> /mnt/_.prefetch
 			else
 				echo "BAD $p" >> /mnt/_.prefetch
 			fi
-		)
+		) > /mnt/_.prefetch.$b 2>&1
 	done
 	) 
 )