[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-159-g1fb1392

[X2Go dev team]

The branch, twofactorauth has been updated
       via  1fb13920c60b17e1e29c279ffcfd142be56d370d (commit)
      from  f7f2e07355a7b60c31d8fbc44ea20818d0807fca (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:
 debian/changelog |    2 ++
 x2go/inifiles.py |    2 +-
 x2go/xserver.py  |    4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6f58069..71a59f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - For the Windows version, make VcXsrv-Server at the development location
       known to Python X2Go.
     - Normalize paths to configuration files.
+    - Make new ini config defaults available in configurations, update list
+      of known X-Servers if new ones are provided in defautlts.py.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index 240785c..9eff56f 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -95,7 +95,7 @@ class X2goIniFile(object):
         # here as we do not want to run into name conflicts between
         # X2Go ini file options and method / property names in
         # SafeConfigParser... This is a pre-cautious approach...
-        self.iniConfig = ConfigParser.SafeConfigParser()
+        self.iniConfig = ConfigParser.SafeConfigParser(self.defaultValues)
         self.iniConfig.optionxform = str
 
         _create_file = False
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 666add1..aa4c203 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -84,6 +84,10 @@ class X2goClientXConfig(inifiles.X2goIniFile):
             raise OSNotSupportedException('classes of x2go.xserver module are for Windows only')
 
         inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
+        _known_xservers = self.known_xservers
+        for xserver in self.defaultValues['XServers']['known_xservers']:
+            if xserver not in self.known_xservers: _known_xservers.append(xserver)
+        self.update_value('XServers', 'known_xservers', _known_xservers)
 
     def get_xserver_config(self, xserver_name):
         """\


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).