mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-30 02:12:45 +00:00
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
This commit is contained in:
parent
fbb275f59d
commit
c58b62eff4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=177527
@ -2196,9 +2196,9 @@ EOF
|
||||
|
||||
# Store merged files.
|
||||
while read F; do
|
||||
if [ -f merge/new/${F} ]; then
|
||||
V=`${SHA256} -q merge/new/${F}`
|
||||
|
||||
if [ -f merge/new/${F} ]; then
|
||||
gzip -c < merge/new/${F} > files/${V}.gz
|
||||
echo "${F}|${V}"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user