Bug 485336, uploadsymbols failures when mozilla-central & tracemonkey nightlies complete at the same time, r=ted.mielczarek
authorNick Thomas <nthomas@mozilla.com>
Thu, 18 Jun 2009 16:19:02 +1200
changeset 29317 2c5544df637698bb3574f6145ace70878ba0f524
parent 29316 e9837550bc40105b5c637925a6b4442289ae1c7d
child 29318 0188051d19d01e56ae963f26eac5f239e759b3be
push id7569
push usernthomas@mozilla.com
push dateThu, 18 Jun 2009 04:19:11 +0000
treeherdermozilla-central@2c5544df6376 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs485336
milestone1.9.2a1pre
Bug 485336, uploadsymbols failures when mozilla-central & tracemonkey nightlies complete at the same time, r=ted.mielczarek
toolkit/crashreporter/tools/upload_symbols.sh
--- a/toolkit/crashreporter/tools/upload_symbols.sh
+++ b/toolkit/crashreporter/tools/upload_symbols.sh
@@ -43,21 +43,22 @@
 #
 # And will use the following optional environment variables if set:
 # SYMBOL_SERVER_SSH_KEY : path to a ssh private key to use
 # SYMBOL_SERVER_PORT    : port to use for ssh
 #
 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"} \
   -l ${SYMBOL_SERVER_USER} ${SYMBOL_SERVER_HOST} \
   "set -e;
    umask 0022;
    cd ${SYMBOL_SERVER_PATH};
    unzip -o '$archive';