[tor-commits] [tor-browser-bundle/master] Fix up backport application so that nightlies contain unmerged patches.

[mikeperry at torproject.org]

commit 440b4c5d059acfa744f9c12c9e3b13f81bbc6140
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Sat Mar 29 22:02:13 2014 -0700

    Fix up backport application so that nightlies contain unmerged patches.
---
 gitian/descriptors/linux/gitian-tor.yml   |    4 ++--
 gitian/descriptors/mac/gitian-tor.yml     |    4 ++--
 gitian/descriptors/windows/gitian-tor.yml |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index bb795c0..698fcba 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -90,14 +90,14 @@ 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
-      git am ~/build/bug11200.patch
     fi
+    git am ~/build/bug11200.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 129a3fe..30c23bb 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -101,14 +101,14 @@ 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
-      git am ~/build/bug11200.patch
     fi
+    git am ~/build/bug11200.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 5cceac9..1698726 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -97,14 +97,14 @@ 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
-      git am ~/build/bug11200.patch
     fi
+    git am ~/build/bug11200.patch
   fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src