[tor-commits] [tor-browser-bundle/master] No need to apply the patch for bug 8402 anymore.

[gk@xxxxxxxxxxxxxx]

commit 416e13ed4e32164d9fa56173cd517c4b2be45b6e
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Thu Sep 11 13:10:53 2014 +0000

    No need to apply the patch for bug 8402 anymore.
    
    Bug 8402 landed on tor master recently which breaks compilation if we'd
    still apply the patch for it when building nightlies.
---
 gitian/descriptors/linux/gitian-tor.yml   |    2 --
 gitian/descriptors/mac/gitian-tor.yml     |    2 --
 gitian/descriptors/windows/gitian-tor.yml |    2 --
 3 files changed, 6 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index bb99d02..3678913 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -87,8 +87,6 @@ script: |
     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 7a75287..88fb40f 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -82,8 +82,6 @@ script: |
     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 277f2d0..ad218f5 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -82,8 +82,6 @@ script: |
     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

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