os.path.dirname returns '' not None in some cases, handle this so inventory can be specified with ./

This commit is contained in:
Michael DeHaan 2013-06-02 16:01:09 -04:00
commit 1f7c197a9d

View file

@ -374,7 +374,11 @@ class Inventory(object):
""" if inventory came from a file, what's the directory? """ """ if inventory came from a file, what's the directory? """
if not self.is_file(): if not self.is_file():
return None return None
return os.path.dirname(self.host_list) dname = os.path.dirname(self.host_list)
if dname is None or dname == '':
cwd = os.getcwd()
return cwd
return dname
def playbook_basedir(self): def playbook_basedir(self):
""" returns the directory of the current playbook """ """ returns the directory of the current playbook """