From 5b46688367c2eb1ef8606b5ad8d461a0413d7f97 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 18 May 2015 18:42:50 +0000 Subject: updated location of build_deb.sh in Tails install script (#181) --- tails/install_in_persistent_volume.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tails/install_in_persistent_volume.sh b/tails/install_in_persistent_volume.sh index 46e0f4eb..2f2b64a9 100755 --- a/tails/install_in_persistent_volume.sh +++ b/tails/install_in_persistent_volume.sh @@ -16,7 +16,7 @@ mkdir -p $INSTALL_DIR # install dependencies apt-get update apt-get install -y build-essential fakeroot python-all python-stdeb python-flask python-stem python-qt4 python-socksipy -./build_deb.sh +./install/build_deb.sh # copy files cp deb_dist/onionshare_*.deb $INSTALL_DIR -- cgit v1.2.3-54-g00ecf From 1f52c9b565ca26a698509194f2856fa56d5fb554 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 18 May 2015 20:54:04 +0000 Subject: Handles a new exception that gets thrown in Tails using a bridge while waiting for the HS --- onionshare/onionshare.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py index 2e948c76..54f3b27e 100644 --- a/onionshare/onionshare.py +++ b/onionshare/onionshare.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . """ -import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, tempfile +import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, httplib, tempfile import socks from stem.control import Controller @@ -208,6 +208,9 @@ class OnionShare(object): except urllib2.HTTPError: # Tails error sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope'))) sys.stdout.flush() + except httplib.BadStatusLine: # Tails (with bridge) error + sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope'))) + sys.stdout.flush() except KeyboardInterrupt: return False return True -- cgit v1.2.3-54-g00ecf