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"
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
