Merge pull request #11795 from amenonsen/nonedir

Don't stat None
This commit is contained in:
James Cammarata 2015-07-29 22:36:21 -04:00
commit 769b0d92ee

View file

@ -78,8 +78,8 @@ def load_config_file():
path0 = os.getenv("ANSIBLE_CONFIG", None)
if path0 is not None:
path0 = os.path.expanduser(path0)
if os.path.isdir(path0):
path0 += "/ansible.cfg"
if os.path.isdir(path0):
path0 += "/ansible.cfg"
path1 = os.getcwd() + "/ansible.cfg"
path2 = os.path.expanduser("~/.ansible.cfg")
path3 = "/etc/ansible/ansible.cfg"