a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check is_directory() before not is_file() in inventory basedir 

Fixes #12742
pull/4420/head
James Cammarata 2015-10-14 11:01:52 -04:00
parent c57200925f
commit 91b0b4d40c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/inventory/__init__.py
View File

@ -614,10 +614,10 @@ class Inventory(object):
def basedir(self): def basedir(self):
""" if inventory came from a file, what's the directory? """ """ if inventory came from a file, what's the directory? """
dname = self.host_list dname = self.host_list
if not self.is_file(): if self.is_directory(self.host_list):
dname = None
elif self.is_directory(self.host_list):
dname = self.host_list dname = self.host_list
elif not self.is_file():
dname = None
else: else:
dname = os.path.dirname(self.host_list) dname = os.path.dirname(self.host_list)
if dname is None or dname == '' or dname == '.': if dname is None or dname == '' or dname == '.':