[Pkg-privacy-commits] [onionshare] 44/53: Decorator is expecting argument to be named slug_candidate, not shutdown_slug_candidate (#200)

[Ulrike Uhlig]

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

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

commit f4780813d68d4bc942e92ea41fd21999f495c184
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Dec 4 13:17:45 2015 -0800

    Decorator is expecting argument to be named slug_candidate, not shutdown_slug_candidate (#200)
---
 onionshare/web.py                | 2 +-
 onionshare_gui/onionshare_gui.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/onionshare/web.py b/onionshare/web.py
index 65acfdf..8956581 100644
--- a/onionshare/web.py
+++ b/onionshare/web.py
@@ -250,7 +250,7 @@ def page_not_found(e):
 shutdown_slug = helpers.random_string(16)
 
 
- at app.route("/<shutdown_slug_candidate>/shutdown")
+ at app.route("/<slug_candidate>/shutdown")
 @check_slug_candidate(shutdown_slug)
 def shutdown():
     """
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index d9d94f9..026b7f4 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -185,7 +185,7 @@ class OnionShareGui(QtGui.QWidget):
         """
         Stop the onionshare server.
         """
-        if self.server_status.status == self.server_status.STATUS_STARTED:
+        if self.server_status.status != self.server_status.STATUS_STOPPED:
             web.stop(self.app.port)
         self.app.cleanup()
         self.filesize_warning.hide()

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