From 4e94db3d78019f6341afdaef031a26d2e9439727 Mon Sep 17 00:00:00 2001 From: Anastasis Andronidis Date: Tue, 4 Sep 2012 16:12:39 +0300 Subject: [PATCH] Fixed a parsing HEAD problem, when ansible is checked out as a submodule Fixed a parsing HEAD problem, when ansible is checked out as a submodule in git --- lib/ansible/utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/ansible/utils.py b/lib/ansible/utils.py index ca0f1b455db..2f2f63196bd 100644 --- a/lib/ansible/utils.py +++ b/lib/ansible/utils.py @@ -324,6 +324,11 @@ def _gitinfo(): result = None repo_path = os.path.join(os.path.dirname(__file__), '..', '..', '.git') if os.path.exists(repo_path): + ''' Check if the .git is a file. If it is a file, it means that we are in a submodule structure. ''' + if os.path.isfile(repo_path): + central_gitdir = yaml.load(open(repo_path))['gitdir'].split('.git')[0] + ''' There is a posibility the .git file to have an absolute path. ''' + repo_path = os.path.join(os.path.relpath(central_gitdir), '.git') f = open(os.path.join(repo_path, "HEAD")) branch = f.readline().split('/')[-1].rstrip("\n") f.close()