Alon Bar-Lev has uploaded a new change for review. Change subject: core: config: respect relative files ......................................................................
core: config: respect relative files Change-Id: I16a7f3384383ee136b866d45087021b431feda01 Signed-off-by: Alon Bar-Lev <[email protected]> --- M src/plugins/otopi/core/config.py 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/otopi refs/changes/85/11285/1 diff --git a/src/plugins/otopi/core/config.py b/src/plugins/otopi/core/config.py index 1102eed..2c186d0 100644 --- a/src/plugins/otopi/core/config.py +++ b/src/plugins/otopi/core/config.py @@ -88,14 +88,18 @@ def _init(self): self.environment.setdefault( constants.CoreEnv.CONFIG_FILE_NAME, - os.environ.get( - constants.SystemEnvironment.CONFIG, - constants.Defaults.CONFIG_FILE, + self.resolveFile( + os.environ.get( + constants.SystemEnvironment.CONFIG, + self.resolveFile(constants.Defaults.CONFIG_FILE), + ) ) ) configs = [] - configFile = self.environment[constants.CoreEnv.CONFIG_FILE_NAME] + configFile = self.resolveFile( + self.environment[constants.CoreEnv.CONFIG_FILE_NAME] + ) configDir = '%s.d' % configFile if os.path.exists(configFile): configs.append(configFile) -- To view, visit http://gerrit.ovirt.org/11285 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16a7f3384383ee136b866d45087021b431feda01 Gerrit-PatchSet: 1 Gerrit-Project: otopi Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
