[tor-commits] [tor-browser-bundle/master] Bug 11481: Fix Nightly build failure.

[gk at torproject.org]

commit 8031a8db85105a7a5ad7f04a7b86774eaa2747b6
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Apr 14 08:34:01 2014 +0000

    Bug 11481: Fix Nightly build failure.
    
    Apply fix for bug 9665 only to bundles that ship tor 0.2.4.x as it
    does not apply cleanly to tor 0.2.5.x.
---
 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 15ba469..28b7d13 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -97,9 +97,9 @@ script: |
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
+      git am ~/build/bug9665.patch
     fi
     git am ~/build/bug11200.patch
-    git am ~/build/bug9665.patch
   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 5ea3b4e..3304f76 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -108,9 +108,9 @@ script: |
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
+      git am ~/build/bug9665.patch
     fi
     git am ~/build/bug11200.patch
-    git am ~/build/bug9665.patch
   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 6369e7f..ce4ef63 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -104,9 +104,9 @@ script: |
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
+      git am ~/build/bug9665.patch
     fi
     git am ~/build/bug11200.patch
-    git am ~/build/bug9665.patch
   fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src