diff options
| author | Michal Židek <mzidek@redhat.com> | 2015-10-15 18:53:37 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2015-10-19 14:04:08 +0200 |
| commit | 6a044fa43d53638c1d0b874d43f58c0428820362 (patch) | |
| tree | 9366861cb1ed800bb2c2a0629626178ef8bea4f1 | |
| parent | c1584502dec8ae19dfd89c6e598cc7648dfd78a6 (diff) | |
| download | sssd-6a044fa43d53638c1d0b874d43f58c0428820362.tar.gz sssd-6a044fa43d53638c1d0b874d43f58c0428820362.tar.xz sssd-6a044fa43d53638c1d0b874d43f58c0428820362.zip | |
SSSDConfig: Do not raise exception if config_file_version is missing
Ticket:
https://fedorahosted.org/sssd/ticket/2837
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
| -rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 8 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 038de16d5..bf61c4027 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -1405,10 +1405,10 @@ class SSSDConfig(SSSDChangeConf): try: if int(self.get('sssd', 'config_file_version')) != self.API_VERSION: raise ParsingError("Wrong config_file_version") - except: - # Either the 'sssd' section or the 'config_file_version' was not - # present in the config file - raise ParsingError("File contains no config_file_version") + except TypeError: + # This happens when config_file_version is missing. We + # can assume it is the default version and continue. + pass def new_config(self): """ diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 5047bd723..a850b8d2c 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -1226,11 +1226,6 @@ class SSSDConfigTestSSSDConfig(unittest.TestCase): srcdir + "/etc/sssd.api.d") self.assertRaises(SSSDConfig.ParsingError, sssdconfig.import_config, srcdir + "/testconfigs/sssd-badversion.conf") - # Negative Test - No config file version - sssdconfig = SSSDConfig.SSSDConfig(srcdir + "/etc/sssd.api.conf", - srcdir + "/etc/sssd.api.d") - self.assertRaises(SSSDConfig.ParsingError, sssdconfig.import_config, srcdir + "/testconfigs/sssd-noversion.conf") - # Negative Test - Already initialized sssdconfig = SSSDConfig.SSSDConfig(srcdir + "/etc/sssd.api.conf", srcdir + "/etc/sssd.api.d") |