From 208f2b66ed04a96f197ab3d47901d5e9b0cdc1d8 Mon Sep 17 00:00:00 2001 From: willthames Date: Thu, 9 Aug 2012 11:05:58 +1000 Subject: [PATCH] Added commit time information to the --version output Now prints date of commit (and timezone offset of commit) Hopefully resolves #783 --- lib/ansible/utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/ansible/utils.py b/lib/ansible/utils.py index bd3556c767..4d0b38363d 100644 --- a/lib/ansible/utils.py +++ b/lib/ansible/utils.py @@ -28,6 +28,7 @@ from ansible import errors from ansible import color from ansible import __version__ import ansible.constants as C +import time try: import json @@ -288,16 +289,19 @@ def default(value, function): return value def _gitinfo(): - ''' returns a string containing git branch and commit id - using gitpython if installed and native file operations if not ''' + ''' 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): with open(os.path.join(repo_path, "HEAD")) as f: branch = f.readline().split('/')[-1].rstrip("\n") - with open(os.path.join(repo_path, "refs", "heads", branch)) as f: + branch_path = os.path.join(repo_path, "refs", "heads", branch) + with open(branch_path) as f: commit = f.readline()[:10] - result = "({0} {1})".format(branch, commit) + date = time.localtime(os.stat(branch_path).st_mtime) + offset = time.timezone if (time.daylight == 0) else time.altzone + result = "({0}) [{1}] {2} ({3:+04d})".format(branch, commit, + time.strftime("%Y%m%d-%H%M%S", date), offset / -36) return result def version(prog):