The branch, twofactorauth has been updated via 6ae080e1e25379e91fdf8c58df5e91fd3b259940 (commit) from 721adf655308f9301c35db4a162be3ac26e91fd0 (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: x2go/backends/printing/_file.py | 1 + x2go/inifiles.py | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py index f9390ce..43e723c 100644 --- a/x2go/backends/printing/_file.py +++ b/x2go/backends/printing/_file.py @@ -125,6 +125,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile): """ if reinit: + self.load() self._detect_print_action() if return_name: diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 3e3c76a..e51b544 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -100,8 +100,19 @@ class X2goIniFile(object): _create_file = True break - self.logger('proposed config files are %s' % config_files, log.loglevel_INFO, ) - _found_config_files = self.iniConfig.read(config_files) + self.load() + + if _create_file: + self.write_user_config = True + self.write() + + def load(self): + """\ + R(e-r)ead configuration file(s). + + """ + self.logger('proposed config files are %s' % self.config_files, log.loglevel_INFO, ) + _found_config_files = self.iniConfig.read(self.config_files) self.logger('config files found: %s' % _found_config_files or 'none', log.loglevel_INFO, ) for file_name in _found_config_files: @@ -113,10 +124,6 @@ class X2goIniFile(object): self.config_files = _found_config_files self._fill_defaults() - if _create_file: - self.write_user_config = True - self.write() - def __repr__(self): result = 'X2goIniFile(' for p in dir(self): 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).