Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed a parsing HEAD problem, when ansible is checked out as a submodule #993

Merged
merged 5 commits into from
Sep 6, 2012
Merged

Fixed a parsing HEAD problem, when ansible is checked out as a submodule #993

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e94db3
Fixed a parsing HEAD problem, when ansible is checked out as a submodule
andronat Sep 4, 2012
6c8171f
Appended repo_path
andronat Sep 4, 2012
44a2883
Fault handling for YAML file and gitdir value.
andronat Sep 4, 2012
63b4f8d
small typo
andronat Sep 4, 2012
ba707f5
except now returns a 'n/a' version. Some changes in comments
andronat Sep 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/ansible/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down