[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-56-g3d70999
X2Go dev team
git-admin at x2go.org
Sat Apr 27 13:04:11 CEST 2013
The branch, build-main has been updated
via 3d70999fd322b0d4ae0724ea9e6d7a2598286e57 (commit)
from b38f22b7ebbcbf943f7a554d5ee1f0a5c08c335b (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