Commit 91b0b4d4 by James Cammarata

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

Fixes #12742
parent c5720092
......@@ -614,10 +614,10 @@ class Inventory(object):
def basedir(self):
""" if inventory came from a file, what's the directory? """
dname = self.host_list
if not self.is_file():
dname = None
elif self.is_directory(self.host_list):
if self.is_directory(self.host_list):
dname = self.host_list
elif not self.is_file():
dname = None
else:
dname = os.path.dirname(self.host_list)
if dname is None or dname == '' or dname == '.':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment