From 91b0b4d40c8874031314300414513dbf2ff975f0 Mon Sep 17 00:00:00 2001 From: James Cammarata <jimi@sngx.net> Date: Wed, 14 Oct 2015 11:01:52 -0400 Subject: [PATCH] Check is_directory() before not is_file() in inventory basedir Fixes #12742 --- lib/ansible/inventory/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index f732c43f034..c31116e0a39 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 == '.':