[Pkg-anonymity-tools] [onionshare] 55/57: Handles a new exception that gets thrown in Tails using a bridge while waiting for the HS

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to annotated tag 0.7
in repository onionshare.

commit 1f52c9b565ca26a698509194f2856fa56d5fb554
Author: Micah Lee <micah at micahflee.com>
Date:   Mon May 18 20:54:04 2015 +0000

    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 2e948c7..54f3b27 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git