commit 6da5650703e7c10f7592232df379963a44fee079
Author: Georg Koppen <g...@torproject.org>
Date: Fri Apr 25 15:13:32 2014 +0000
Fix broken nightly due to patch for bug 11200.
It seems the patch for bug 11200 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 5c4ae00..826d355 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -78,8 +78,8 @@ script: |
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
git am ~/build/bug9665.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 98668ac..c3ae8d8 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -109,8 +109,8 @@ script: |
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
git am ~/build/bug9665.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 ffac916..5e452b9 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -105,8 +105,8 @@ script: |
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
git am ~/build/bug9665.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
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
