From b26d0196f175e3ef160f09d764fb4b87fca7cb7a Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 18 Jun 2009 16:19:02 +1200 Subject: [PATCH] Bug 485336, uploadsymbols failures when mozilla-central & tracemonkey nightlies complete at the same time, r=ted.mielczarek --- toolkit/crashreporter/tools/upload_symbols.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolkit/crashreporter/tools/upload_symbols.sh b/toolkit/crashreporter/tools/upload_symbols.sh index 4640f32d2ec5..8caf5735714a 100755 --- a/toolkit/crashreporter/tools/upload_symbols.sh +++ b/toolkit/crashreporter/tools/upload_symbols.sh @@ -48,11 +48,12 @@ set -e : ${SYMBOL_SERVER_HOST?} ${SYMBOL_SERVER_USER?} ${SYMBOL_SERVER_PATH?} ${1?"You must specify a symbol archive to upload"} -archive=`basename "$1"` +hash=`openssl dgst -sha1 "$1" | cut -f2 -d' '` +archive="${hash}-"`basename "$1"` echo "Transferring symbols... $1" scp ${SYMBOL_SERVER_PORT:+-P $SYMBOL_SERVER_PORT} \ ${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} "$1" \ - ${SYMBOL_SERVER_USER}@${SYMBOL_SERVER_HOST}:${SYMBOL_SERVER_PATH}/ + ${SYMBOL_SERVER_USER}@${SYMBOL_SERVER_HOST}:${SYMBOL_SERVER_PATH}/"${archive}" echo "Unpacking symbols on remote host..." ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \ ${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} \