# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1415395112 28800
# Node ID a3ef2402ca09f8b6212f6dfb5ddfe182180ba1f7
# Parent  9d0c166bc9ac2c7deea2a19710260730ded6235a# Parent  aed756d6934e1639fc151e603c03f515ba3a609b
Merge changes.

diff -r 9d0c166bc9ac -r a3ef2402ca09 plat/unix/update_tags.sh
--- a/plat/unix/update_tags.sh	Fri Nov 07 13:15:20 2014 -0800
+++ b/plat/unix/update_tags.sh	Fri Nov 07 13:18:32 2014 -0800
@@ -65,6 +65,9 @@
 echo "Locking tags file..."
 echo $$ > "$TAGS_FILE.lock"
 
+# Remove lock and temp file if script is stopped unexpectedly.
+trap "rm -f \"$TAGS_FILE.lock\" \"$TAGS_FILE.temp\"" 0 3 4 15
+
 if [ -f "$TAGS_FILE" ]; then
     if [ "$UPDATED_SOURCE" != "" ]; then
         echo "Removing references to: $UPDATED_SOURCE"