From c58b62eff448cc36959e4ad12481815ace33a4f3 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 23 Mar 2008 13:41:54 +0000
Subject: [PATCH] When updating the install list for files which have had local
 changes merged with upgrade changes, don't try to compute the SHA256 hash of
 files which don't exist.

Reported by:	Jaakko Heinonen
MFC after:	1 week
---
 usr.sbin/freebsd-update/freebsd-update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index d603109de1cd..f3ecf1f3fd9b 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2196,9 +2196,9 @@ EOF
 
 		# Store merged files.
 		while read F; do
-			V=`${SHA256} -q merge/new/${F}`
-
 			if [ -f merge/new/${F} ]; then
+				V=`${SHA256} -q merge/new/${F}`
+
 				gzip -c < merge/new/${F} > files/${V}.gz
 				echo "${F}|${V}"
 			fi