diff options
| author | cperciva <cperciva@FreeBSD.org> | 2008-03-23 13:41:54 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2008-03-23 13:41:54 +0000 |
| commit | 5e55dd67176633e7adc6e3726f22960f15941c9a (patch) | |
| tree | ace3e366b1e82de4841d43fb96cff4fa475afb12 /usr.sbin/freebsd-update | |
| parent | e1e2efa7be1ec08a595a7080c1c2f6030ec02b67 (diff) | |
| download | FreeBSD-src-5e55dd67176633e7adc6e3726f22960f15941c9a.zip FreeBSD-src-5e55dd67176633e7adc6e3726f22960f15941c9a.tar.gz | |
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
Diffstat (limited to 'usr.sbin/freebsd-update')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index d603109..f3ecf1f 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 |
