From owner-svn-src-all@FreeBSD.ORG  Wed Mar 23 13:43:56 2011
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 ED5FF1065678;
	Wed, 23 Mar 2011 13:43:56 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE5958FC12;
	Wed, 23 Mar 2011 13:43: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 p2NDhuxk096000;
	Wed, 23 Mar 2011 13:43:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2NDhuRs095998;
	Wed, 23 Mar 2011 13:43:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201103231343.p2NDhuRs095998@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 23 Mar 2011 13:43: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: r219903 - head/usr.sbin/bsdinstall/scripts
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: Wed, 23 Mar 2011 13:43:57 -0000

Author: nwhitehorn
Date: Wed Mar 23 13:43:56 2011
New Revision: 219903
URL: http://svn.freebsd.org/changeset/base/219903

Log:
  Mark any distfiles with no checksum entries in the manifest "Skipped"
  instead of "Passed".

Modified:
  head/usr.sbin/bsdinstall/scripts/checksum

Modified: head/usr.sbin/bsdinstall/scripts/checksum
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/checksum	Wed Mar 23 13:10:15 2011	(r219902)
+++ head/usr.sbin/bsdinstall/scripts/checksum	Wed Mar 23 13:43:56 2011	(r219903)
@@ -42,17 +42,23 @@ for dist in $DISTRIBUTIONS; do
 	    0 0 $percentage $items
 
 	CK=`sha256 -q $BSDINSTALL_DISTDIR/$dist`
-	awk -v checksum=$CK -v dist=$dist '{
+	awk -v checksum=$CK -v dist=$dist -v found=0 '{
 		if (dist == $1) {
+			found = 1
 			if (checksum == $2)
 				exit(0)
 			else
-				exit(1)
+				exit(2)
 		}
-	}' $BSDINSTALL_DISTDIR/MANIFEST
+	} END {if (!found) exit(1);}' $BSDINSTALL_DISTDIR/MANIFEST
 
-	if [ $? -eq 0 ]; then
-		eval "status_$distname=2"
+	CK_VALID=$?
+	if [ $CK_VALID -le 1 ]; then
+		if [ $CK_VALID -eq 0 ]; then
+			eval "status_$distname=2"
+		else
+			eval "status_$distname=6"
+		fi
 		percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc)
 	else
 		eval "status_$distname=1"