[tor-commits] [tor-browser-bundle/master] Switch to freshly rebased tor-browser-builder-2 branch for gitian-builder.

[mikeperry@xxxxxxxxxxxxxx]

commit ab2751680a6797fbadd68b63230c48eb56412f3c
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Wed Jul 10 09:00:51 2013 -0700

    Switch to freshly rebased tor-browser-builder-2 branch for gitian-builder.
---
 gitian/check-prerequisites.sh |    2 +-
 gitian/fetch-inputs.sh        |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index 201b489..ed96c91 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -27,7 +27,7 @@ then
   echo
   echo "Please run:"
   echo " cd ../../ "
-  echo " torsocks git clone -b tor-browser-builder-1 https://git.torproject.org/builders/gitian-builder.git";
+  echo " torsocks git clone -b tor-browser-builder-2 https://git.torproject.org/builders/gitian-builder.git";
   echo " cd -"
   exit 1
 fi
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 8c9f6fa..21728e5 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -135,6 +135,7 @@ cd ..
 git remote set-url origin https://git.torproject.org/builders/gitian-builder.git
 git fetch origin
 git fetch --tags origin
+git checkout tor-browser-builder-2
 cd inputs
 
 if [ -d tbb-windows-installer/.git ];

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