commit ad82b1ef6f99a8468e6e02c0977546a23bd0149c Author: Georg Koppen gk@torproject.org Date: Fri Jan 30 11:27:17 2015 +0000

Bug 14526: Merge of #8405 breaks nightly builds --- gitian/descriptors/linux/gitian-tor.yml | 3 ++- gitian/descriptors/mac/gitian-tor.yml | 3 ++- gitian/descriptors/windows/gitian-tor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f9795ea..87f3f10 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,7 +80,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 9cedf67..a772a74 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index dce98f8..9cbbb86 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src