Sun Dec 14 14:09:33 2008 UTC ()

Added a -v flag to the verify_file function, which in case of a
verification failure prints a useful and concrete error message.


(rillig)

diff -r1.10 -r1.11 pkgsrc/mk/fetch/fetch

--- pkgsrc/mk/fetch/fetch 2008/09/15 21:07:46 1.10
+++ pkgsrc/mk/fetch/fetch 2008/12/14 14:09:32 1.11

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: fetch,v 1.10 2008/09/15 21:07:46 rillig Exp $
+# $NetBSD: fetch,v 1.11 2008/12/14 14:09:32 rillig Exp $
+#
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -179,42 +179,54 @@ if ${TEST} -n "$distinfo"; then
 		case "$d_type" in
 		Size)	;;	# only handle "Size" lines
 		*)	continue ;;
 		esac
 		case "$fetchdir" in
 		".")	${TEST} "$d_file" = "($file)" || continue ;;
 		*)	${TEST} "$d_file" = "($path)" || continue ;;
 		esac
 		distsize="$d_size"; distunits="$d_units"
 		break
 	done < $distinfo
 fi
-# verify_file $file
+# verify_file [-v] $file
 #	If we can checksum the file, then see if it matches the listed
 #	checksums in the distinfo file.  If we can check the size, then
 #	check that instead.  We strip off ".pkgsrc.resume" from the
 #	filename so that we can verify the checksum for the temporary
 #	fetch file as well.
+#
 verify_file() {
 	_if_verbose=:; if [ "x$1" = "x-v" ]; then shift; _if_verbose=; fi
 	_file="${1#./}"
-	${TEST} -f $_file || return 1
+	${TEST} -f $_file || {
 		$_if_verbose ${ECHO} 1>&2 "$self: File $_file does not exist."
 		return 1
+	}
 	if ${TEST} -n "$checksum"; then
-		${CHECKSUM} -s ".pkgsrc.resume" $distinfo ${_file} || return 1
+		echo "foo"
 		read line
 		${CHECKSUM} -s ".pkgsrc.resume" $distinfo ${_file} || {
 			$_if_verbose ${ECHO} 1>&2 "$self: Checksum of the file $_file doesn't match."
 			return 1
+		}
 		return 0
 	elif ${TEST} -n "$distsize"; then
 		_size=`${WC} -c < $_file`
-		${TEST} "$_size" -eq "$distsize" || return 1
+		${TEST} "$_size" -eq "$distsize" || {
 			$_if_verbose ${ECHO} 1>&2 "$self: Size of the file $_file doesn't match."
 			return 1
+		}
 		return 0
 	fi
 	return 0;
+}
 # If the file already exists and it verifies, then we don't need to fetch
 # it again.
+#
 if verify_file $path; then
 	exit 0
 fi
 ${TEST} -d $fetchdir || ${MKDIR} -p $fetchdir 2>/dev/null
 @@ -260,31 +272,29 @@ while ${TEST} $# -gt 0; do
 	( cd $fetchdir
 	  if ${TEST} -n "$resume"; then
 		fetch_cmd="${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_RESUME_ARGS} ${FETCH_OUTPUT_ARGS} $outputfile $site$file"
 	  else
 		fetch_cmd="${FETCH_CMD} ${FETCH_BEFORE_ARGS} $site$file ${FETCH_AFTER_ARGS}"
 	  fi
 	  ${TEST} -z "$verbose" || ${ECHO} "$fetch_cmd"
 	  $fetch_cmd )
 	if ${TEST} $? -ne 0; then
 		${ECHO} 1>&2 "$self: Unable to fetch expected file $file"
 		continue
 	fi
-	if verify_file $outputpath; then
+	if verify_file -v $outputpath; then
 		${TEST} -z "$resume" || ${MV} -f $outputpath $path
 		break
 	else
 		${ECHO} 1>&2 "$self: Unable to verify fetched file $file"
 	fi
 	if ${TEST} -n "$resume"; then
 		if ${TEST} -f $path; then
 			${CP} -f $path $outputpath
 		else
 			${TOUCH} $outputpath
 		fi
 	fi
 done
 if ${TEST} -f $path; then
 	exit 0
 else
 	exit 1