[X2go-Commits] x2gobroker.git - master (branch) updated: 051ecfd603383cc3f38b225d36414a4d55928616

[X2Go dev team]

The branch, master has been updated
       via  051ecfd603383cc3f38b225d36414a4d55928616 (commit)
       via  7cec31fca2245fd8d9dfb2bc5f85d6c31019e067 (commit)
      from  ef3376100abb26ecf5befeb5e2c76b12656fa131 (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 -----------------------------------------------------------------
commit 051ecfd603383cc3f38b225d36414a4d55928616
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 7 09:23:08 2012 +0100

    move inifile backend's list_profiles() method into base.X2GoBroker, as it is so generic

commit 7cec31fca2245fd8d9dfb2bc5f85d6c31019e067
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 7 09:22:39 2012 +0100

    add EOL char behind section tag in session profile list rendered by text/plain renderer

-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/backends/base.py    |   10 +++++++++-
 x2gobroker/backends/inifile.py |   12 ------------
 x2gobroker/web/plain.py        |    2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/backends/base.py b/x2gobroker/backends/base.py
index 50be3f1..9c2e5b7 100644
--- a/x2gobroker/backends/base.py
+++ b/x2gobroker/backends/base.py
@@ -393,7 +393,15 @@ class X2GoBroker(object):
         rtype: C{dict}
 
         """
-        return {}
+        list_of_profiles = {}
+        for profile_id in self.get_profile_ids():
+            profile = self.get_profile(profile_id)
+            acls = self.get_profile_acls(profile_id)
+
+            if self.check_acls(username, acls):
+                list_of_profiles.update(profile)
+
+        return list_of_profiles
 
     def select_profile(self, profile_name='DEFAULT'):
         """\
diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py
index 1c166c8..f5080f1 100644
--- a/x2gobroker/backends/inifile.py
+++ b/x2gobroker/backends/inifile.py
@@ -82,18 +82,6 @@ class X2GoBroker(base.X2GoBroker):
                 del profile[key]
         return profile
 
-    def list_profiles(self, username):
-
-        list_of_profiles = {}
-        for profile_id in self.get_profile_ids():
-            profile = self.get_profile(profile_id)
-            acls = self.get_profile_acls(profile_id)
-
-            if self.check_acls(username, acls):
-                list_of_profiles.update(profile)
-
-        return list_of_profiles
-
     def select_profile(self, profile_name):
 
         selectprofile_output = {
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index d158cfa..229d58d 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -112,7 +112,7 @@ class X2GoBrokerWebPlain:
                     output += "START_USER_SESSIONS\n"
                     #output += "START_USER_SESSIONS<br>"
                     for profile_id in profiles:
-                        output += "[{profile_id}]".format(profile_id=profile_id)
+                        output += "[{profile_id}]\n".format(profile_id=profile_id)
                         for key in profiles[profile_id].keys():
                             if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType):
                                 output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key]))


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).