This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/0.4.0.x in repository python-x2go. commit 9557481bfc0add6554ac67b0fc4a1a0323ce1bbc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 8 22:18:44 2014 +0100 Don't parse default values to ConfigParser constructor when initializing an INI file. Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 9 +++++++++ x2go/inifiles.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 11ca201..c3db46e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-x2go (0.4.0.10-0x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.4.0.10): + - Don't parse default values to ConfigParser constructor when initializing + an INI file. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 05 Jan 2014 16:35:57 +0100 + python-x2go (0.4.0.9-0x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 8d4d754..4556b30 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.defaultValues) + self.iniConfig = ConfigParser.SafeConfigParser() self.iniConfig.optionxform = str _create_file = False -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git