[Pkg-anonymity-tools] [onionshare] 12/57: Merge branch 'respect-fellow-hs' of github.com:hidden-id/onionshare into hidden-id-respect-fellow-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 a70ddacb264a80cbbfdac50de8d63d10c9a6514b
Merge: 62d8188 0b50829
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Nov 17 10:51:30 2014 -0800

    Merge branch 'respect-fellow-hs' of github.com:hidden-id/onionshare into hidden-id-respect-fellow-hs
    
    Conflicts:
    	onionshare/onionshare.py

 onionshare/onionshare.py | 78 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 22 deletions(-)

diff --cc onionshare/onionshare.py
index 3fa13ad,daf35e5..44b6874
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@@ -249,21 -283,20 +283,21 @@@ def main()
      t.daemon = True
      t.start()
  
-     # wait for hs
-     ready = app.wait_for_hs()
-     if not ready:
-         sys.exit()
+     try: # Trap Ctrl-C
+         # wait for hs
+         ready = app.wait_for_hs()
+         if not ready:
+             sys.exit()
 -    
 +
-     print strings._("give_this_url")
-     print 'http://{0}/{1}'.format(app.onion_host, web.slug)
-     print ''
-     print strings._("ctrlc_to_stop")
+         print strings._("give_this_url")
+         print 'http://{0}/{1}'.format(app.onion_host, web.slug)
+         print ''
+         print strings._("ctrlc_to_stop")
 -    
 +
-     # wait for app to close
-     try:
+         # wait for app to close
 -        while True:
 -            time.sleep(0.5)
 +        while t.is_alive():
-             # t.join() can't catch KeyboradInterrupt in such as Ubuntu
++            # t.join() can't catch KeyboardInterrupt in such as Ubuntu
 +            t.join(0.5)
      except KeyboardInterrupt:
          web.stop(app.port)
      finally:

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