diff options
| author | Micah Lee <micah@micahflee.com> | 2015-05-18 15:53:10 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2015-05-18 15:53:10 -0700 |
| commit | c0f049bcff2f7c4b51357ab48baa7856ee9f4de2 (patch) | |
| tree | e623865300f16743156ba3d7b788391c41db0abe | |
| parent | 31193d63cdb7fc8a62736547c00f0238ade8b330 (diff) | |
| parent | 1f52c9b565ca26a698509194f2856fa56d5fb554 (diff) | |
| download | onionshare-c0f049bcff2f7c4b51357ab48baa7856ee9f4de2.tar.gz onionshare-c0f049bcff2f7c4b51357ab48baa7856ee9f4de2.zip | |
Merge branch 'master' of github.com:micahflee/onionshare0.7
| -rw-r--r-- | onionshare/onionshare.py | 5 | ||||
| -rwxr-xr-x | tails/install_in_persistent_volume.sh | 2 |
2 files changed, 5 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>. """ -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 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 |