wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #993 from andronat/repo-as-submodule

Browse source 
Fixed a parsing HEAD problem, when ansible is checked out as a submodule
This commit is contained in:
Michael DeHaan 2012-09-05 17:04:09 -07:00
commit 0c386b0514
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/utils.py
View file

@ -323,7 +323,17 @@ def _gitinfo():
''' returns a string containing git branch, commit id and commit date '''
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):
try:
central_gitdir = yaml.load(open(repo_path)).get('gitdir').split('.git')[0]
repo_path = repo_path.split('.git')[0]
# There is a posibility the .git file to have an absolute path.
repo_path = os.path.join(repo_path, os.path.relpath(central_gitdir), '.git')
except (IOError, AttributeError):
return 'n/a'
f = open(os.path.join(repo_path, "HEAD"))
branch = f.readline().split('/')[-1].rstrip("\n")
f.close()