The branch, master has been updated via 5337f67d11bd2b5c7d2d394495a55d533d0c4c53 (commit) from 83a1d2999db1627f10440efb800843565f13425d (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 5337f67d11bd2b5c7d2d394495a55d533d0c4c53 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 23 10:11:06 2012 +0100 Make sure xconfig configuration changes provided by defaults.py get written to the config file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/inifiles.py | 2 +- x2go/xserver.py | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d5ab27..ddca0e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low of known X-Servers if new ones are provided in defautlts.py. - Provide function merge_ordered_lists in utils.py, merge list of default known_xservers with configured known_xservers. + - Make sure xconfig configuration changes provided by defaults.py get + written to the config file. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 9eff56f..2f2fc62 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -122,7 +122,7 @@ class X2goIniFile(object): self.logger('config files found: %s' % _found_config_files or 'none', loglevel=log.loglevel_INFO, ) for file_name in _found_config_files: - if file_name.startswith(_current_home): + if file_name.startswith(os.path.normpath(_current_home)): # we will use the first file found in the user's home dir for writing modifications self.user_config_file = file_name break diff --git a/x2go/xserver.py b/x2go/xserver.py index 79e97a7..45bd465 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -87,7 +87,11 @@ class X2goClientXConfig(inifiles.X2goIniFile): inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel) _known_xservers = utils.merge_ordered_lists(self.defaultValues['XServers']['known_xservers'], self.known_xservers) - self.update_value('XServers', 'known_xservers', _known_xservers) + + if _known_xservers != self.known_xservers: + self.update_value('XServers', 'known_xservers', _known_xservers) + self.write_user_config = True + self.write() 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).