diff options
| author | James Cammarata <jimi@sngx.net> | 2015-10-14 11:01:52 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-10-14 11:03:10 -0400 |
| commit | 91b0b4d40c8874031314300414513dbf2ff975f0 (patch) | |
| tree | 2116ed4b5a1f8a010a8fafbd7c8c3d4959cfcacf /lib/ansible/inventory | |
| parent | c57200925f7fc3c77da9a0b671ef7328cad15d8d (diff) | |
| download | ansible-91b0b4d40c8874031314300414513dbf2ff975f0.tar.gz | |
Check is_directory() before not is_file() in inventory basedir
Fixes #12742
Diffstat (limited to 'lib/ansible/inventory')
| -rw-r--r-- | lib/ansible/inventory/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index f732c43f03..c31116e0a3 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -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 == '.': |