[Pkg-anonymity-tools] [onionshare] 73/140: Merge pull request #124 from kkka/fix-wait_for_hs-bug

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository onionshare.

commit 8c9bcdad6d7bf7a7214b9a9211c0e3ad63819665
Merge: c161003 a5b3d45
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Sep 2 17:23:00 2014 -0700

    Merge pull request #124 from kkka/fix-wait_for_hs-bug
    
    Fix wait_for_hs bug when specifying --local-only

 onionshare/onionshare.py | 3 +++
 1 file changed, 3 insertions(+)

diff --cc onionshare/onionshare.py
index cd85343,d44f36b..fb012bd
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@@ -112,8 -94,14 +112,11 @@@ class OnionShare(object)
                  self.onion_host = open(hostname_file, 'r').read().strip()
  
      def wait_for_hs(self):
+         if self.local_only:
+             return True
+ 
          print strings._('wait_for_hs')
  
 -        if helpers.get_platform() == 'Tails':
 -            import urllib2
 -
          ready = False
          while not ready:
              try:

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