[tor-commits] [tor-browser-bundle/master] Fix broken nightly due to patch for bug 9229.

[gk@xxxxxxxxxxxxxx]

commit d984aa174e42c1a1919ed8a763ab33b095067278
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Fri Apr 25 11:46:35 2014 +0000

    Fix broken nightly due to patch for bug 9229.
    
    It seems the patch for bug 9229 does not apply cleanly to the latest
    tor master anymore. Make sure it gets only applied when 0.2.4 is used.
---
 gitian/descriptors/linux/gitian-tor.yml   |    2 +-
 gitian/descriptors/mac/gitian-tor.yml     |    2 +-
 gitian/descriptors/windows/gitian-tor.yml |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 60a5015..5c4ae00 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -71,9 +71,9 @@ script: |
     git am ~/build/bug10297.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
-    git am ~/build/bug9229.patch
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
+      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 3304f76..98668ac 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -102,9 +102,9 @@ script: |
     git am ~/build/bug10297.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
-    git am ~/build/bug9229.patch
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
+      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index ce4ef63..ffac916 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -98,9 +98,9 @@ script: |
     git am ~/build/bug10297.patch
   fi
   if [ $BUILD_PT_BUNDLES ]; then
-    git am ~/build/bug9229.patch
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
+      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits