[tor-commits] [tor-browser-bundle/master] Bug 12920: Don't apply patch for #11200 to master.

[gk at torproject.org]

commit 8a552ff03c226c3d1f5fa3ae0b4950cc03c0f678
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Aug 25 15:28:14 2014 +0000

    Bug 12920: Don't apply patch for #11200 to master.
    
    On the tor master branch #11200 is already fixed. Applying the patch
    again breaks the nightly builds.
---
 gitian/descriptors/linux/gitian-tor.yml   |    5 ++++-
 gitian/descriptors/mac/gitian-tor.yml     |    5 ++++-
 gitian/descriptors/windows/gitian-tor.yml |    5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index c741cf2..277a8e4 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -81,9 +81,12 @@ script: |
       git am ~/build/bug9665.patch
       git am ~/build/bug11200.patch
       git am ~/build/bug8402.patch
-    else
+    elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
+    then
       git am ~/build/bug8402-master.patch
       git am ~/build/bug11200-hang-0.2.5.patch
+    else
+      git am ~/build/bug8402-master.patch
     fi
   fi
   mkdir -p $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index e708ef8..7a75287 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -78,9 +78,12 @@ script: |
       git am ~/build/bug9665.patch
       git am ~/build/bug11200.patch
       git am ~/build/bug8402.patch
-    else
+    elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
+    then
       git am ~/build/bug8402-master.patch
       git am ~/build/bug11200-hang-0.2.5.patch
+    else
+      git am ~/build/bug8402-master.patch
     fi
   fi
   mkdir -p $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index f1b9d7d..bc70839 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -78,9 +78,12 @@ script: |
       git am ~/build/bug9665.patch
       git am ~/build/bug11200.patch
       git am ~/build/bug8402.patch
-    else
+    elif [ ${TOR_TAG::9} == "tor-0.2.5" ];
+    then
       git am ~/build/bug8402-master.patch
       git am ~/build/bug11200-hang-0.2.5.patch
+    else
+      git am ~/build/bug8402-master.patch
     fi
   fi
   mkdir -p $OUTDIR/src