From 3680d65d1d69d552345180604d0338d338417273 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 9 Feb 2018 11:01:40 -0500 Subject: [PATCH] deal with no config for view fixes #35965 --- lib/ansible/cli/config.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index 17a67584f9a..170b95adfaa 100644 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -73,18 +73,23 @@ class ConfigCLI(CLI): else: self.config = ConfigManager() self.config_file = find_ini_config_file() - try: - if not os.path.exists(self.config_file): - raise AnsibleOptionsError("%s does not exist or is not accessible" % (self.config_file)) - elif not os.path.isfile(self.config_file): - raise AnsibleOptionsError("%s is not a valid file" % (self.config_file)) - - os.environ['ANSIBLE_CONFIG'] = to_native(self.config_file) - except: - if self.action in ['view']: - raise - elif self.action in ['edit', 'update']: - display.warning("File does not exist, used empty file: %s" % self.config_file) + + if self.config_file: + try: + if not os.path.exists(self.config_file): + raise AnsibleOptionsError("%s does not exist or is not accessible" % (self.config_file)) + elif not os.path.isfile(self.config_file): + raise AnsibleOptionsError("%s is not a valid file" % (self.config_file)) + + os.environ['ANSIBLE_CONFIG'] = to_native(self.config_file) + except: + if self.action in ['view']: + raise + elif self.action in ['edit', 'update']: + display.warning("File does not exist, used empty file: %s" % self.config_file) + + elif self.action == 'view': + raise AnsibleError('Invalid or no config file was supplied') self.execute()