[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.1.0-22-g8cf905c

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:10:09 CEST 2013


The branch, statusflag has been updated
       via  8cf905c4399d9737cb613acadaa1d6f6d5683f96 (commit)
      from  78623cec81402fea0f8e36c01fa15261cd1abba3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/web/extras.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py
index f61c676..cdb810b 100644
--- a/x2gobroker/web/extras.py
+++ b/x2gobroker/web/extras.py
@@ -42,7 +42,7 @@ class X2GoBrokerPubKeyService(tornado.web.RequestHandler):
         for http_header_item in self.http_header_items.keys():
             self.set_header(http_header_item, self.http_header_items[http_header_item])
 
-    def get(self):
+    def get(self, *args, **kwargs):
 
         output = ""
 
@@ -56,7 +56,4 @@ class X2GoBrokerPubKeyService(tornado.web.RequestHandler):
             pubkey = paramiko.DSSKey(filename='{home}/.ssh/id_dsa'.format(home=broker_home))
             output += 'ssh-dss {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME)
 
-        if not output:
-            raise tornado.web.HTTPError(404)
-
         self.write(output)


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list