[tbb-commits] [tor-browser-bundle/master] Properly check the Tor tag before applying backport patches.

[mikeperry at torproject.org]

commit 2edf15136f5bbc939b4420537b779ab80a8c955c
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Mar 7 11:28:41 2014 -0800

    Properly check the Tor tag before applying backport patches.
    
    Also only aply #5018 for PT-enabled bundles.
---
 gitian/descriptors/linux/gitian-tor.yml   |    7 +++++--
 gitian/descriptors/mac/gitian-tor.yml     |    7 +++++--
 gitian/descriptors/windows/gitian-tor.yml |    8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 8a50ed4..a83d8a4 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -77,13 +77,16 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
   then
     git am ~/build/bug10297.patch
-    git am ~/build/bug5018.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
     git am ~/build/bug11069.patch
+    if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+    then
+      git am ~/build/bug5018.patch
+    fi
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index d2aab2f..1596c8e 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -93,13 +93,16 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
   then
     git am ~/build/bug10297.patch
-    git am ~/build/bug5018.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
     git am ~/build/bug11069.patch
+    if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+    then
+      git am ~/build/bug5018.patch
+    fi
   fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 00b1f9a..9033939 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -89,14 +89,16 @@ script: |
   export GIT_COMMITTER_NAME="nobody"
   export GIT_COMMITTER_EMAIL="nobody at localhost"
   export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
-  if [ ${TOR_TAG:9} == "tor-0.2.4" ];
+  if [ ${TOR_TAG::9} == "tor-0.2.4" ];
   then
     git am ~/build/bug10297.patch
-    git am ~/build/bug5018.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
     git am ~/build/bug11069.patch
-  fi
+    if [ ${TOR_TAG::9} == "tor-0.2.4" ];
+    then
+      git am ~/build/bug5018.patch
+    fi  fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh