[Pkg-privacy-commits] [onionshare] 53/256: Handle new Tor controller errors in GUI

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository onionshare.

commit fa7bec2fae6f87a7a36de4320067d0eafdf6b23f
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Dec 29 10:34:40 2016 -0800

    Handle new Tor controller errors in GUI
---
 onionshare_gui/onionshare_gui.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index 83b1320..8a5858d 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -177,11 +177,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
                 self.app.start_onion_service()
                 self.starting_server_step2.emit()
 
-            except onionshare.onion.NoTor as e:
-                self.starting_server_error.emit(e.args[0])
-                return
-
-            except onionshare.onion.TorTooOld as e:
+            except (onionshare.onion.NoTor, onionshare.onion.TorTooOld, onionshare.onion.TorErrorInvalidSetting, onionshare.onion.TorErrorSocketPort, onionshare.onion.TorErrorSocketFile, onionshare.onion.TorErrorMissingPassword, onionshare.onion.TorErrorUnreadableCookieFile) as e:
                 self.starting_server_error.emit(e.args[0])
                 return
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git