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

Fixes #12742
2015-10-14 11:01:52 -04:00 · 2015-10-14 11:01:52 -04:00 · 91b0b4d40c
parent c57200925f
commit 91b0b4d40c
1 changed files with 3 additions and 3 deletions
--- 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 == '.':