Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2gobroker.git - master (branch) updated: 1652fda04d5ead18a5f891366b0d8aa47f90aebe
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Friday 25th January 2013 11:07:31 UTC (over 3 years ago)
The branch, master has been updated
       via  1652fda04d5ead18a5f891366b0d8aa47f90aebe (commit)
       via  2636bc9f7f5a7497712338de870bc3458a7437c5 (commit)
      from  6b97f598d6da87995bed44366f22629cb28e8341 (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 1652fda04d5ead18a5f891366b0d8aa47f90aebe
Author: Mike Gabriel

Date:   Fri Jan 25 12:08:17 2013 +0100

    find more occurences of session profiles path that got changed recently

commit 2636bc9f7f5a7497712338de870bc3458a7437c5
Author: Mike Gabriel

Date:   Fri Jan 25 12:06:45 2013 +0100

    sort profiles by profile ids when returned TTW

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

Summary of changes:
 debian/x2gobroker-daemon.default |    2 +-
 debian/x2gobroker-daemon.init    |    2 +-
 x2gobroker/web/plain.py          |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/x2gobroker-daemon.default
b/debian/x2gobroker-daemon.default
index 19130fa..0165e17 100644
--- a/debian/x2gobroker-daemon.default
+++ b/debian/x2gobroker-daemon.default
@@ -13,7 +13,7 @@ START_DAEMON=true
 #X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf
 
 # path to the X2Go Session Broker's session profiles file (when using the
inifile backend)
-#X2GOBROKER_SESSIONPROFILES=/etc/x2go/x2gobroker-sessionprofiles.conf
+#X2GOBROKER_SESSIONPROFILES=/etc/x2go/broker/x2gobroker-sessionprofiles.conf
 
 # path to the X2Go Session Broker's agent command
 #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index 8772320..3dda287 100644
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -29,7 +29,7 @@ START_DAEMON=false
 DAEMON_BIND_ADDRESS=127.0.0.1:8080
 X2GOBROKER_DEFAULT_BACKEND="zeroconf"
 X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
-X2GOBROKER_SESSIONPROFILES="/etc/x2go/x2gobroker-sessionprofiles.conf"
+X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf"
 X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent"
 test -f $DEBIANCONFIG && . $DEBIANCONFIG
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 96eb9cc..cc93fc9 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -108,7 +108,9 @@ class X2GoBrokerWebPlain:
                 profiles = broker_backend.list_profiles(username)
                 if profiles:
                     output += "START_USER_SESSIONS\n\n"
-                    for profile_id in profiles:
+                    profile_ids = profiles.keys()
+                    profile_ids.sort()
+                    for profile_id in profile_ids:
                         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):


hooks/post-receive
 
CD: 3ms