d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

portsnap: Detect error immediately if we can't fetch the snapshot metadata.

Browse Source 
Also add some quotes around command substitution where useful and possible.

Reviewed by:	cperciva
MFC after:	1 week
This commit is contained in:
jilles 2011-10-04 22:28:06 +00:00
parent 943e8837f5
commit 56aec06683
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/portsnap/portsnap/portsnap.sh
View File

@ -536,9 +536,9 @@ fetch_metadata() {
rm -f ${SNAPSHOTHASH} tINDEX.new
echo ${NDEBUG} "Fetching snapshot metadata... "
fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH}
fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH} \
2>${QUIETREDIR} || return
if [ `${SHA256} -q ${SNAPSHOTHASH}` != ${SNAPSHOTHASH} ]; then
if [ "`${SHA256} -q ${SNAPSHOTHASH}`" != ${SNAPSHOTHASH} ]; then
echo "snapshot metadata corrupt."
return 1
fi
@ -606,7 +606,7 @@ fetch_index_sanity() {
# Verify a list of files
fetch_snapshot_verify() {
while read F; do
if [ `gunzip -c snap/${F} | ${SHA256} -q` != ${F} ]; then
if [ "`gunzip -c snap/${F} | ${SHA256} -q`" != ${F} ]; then
echo "snapshot corrupt."
return 1
fi