From 21c3784a43baaece7582b67c86827da00acedc80 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sun, 28 Sep 2014 11:24:32 -0400 Subject: [PATCH] If submodules are not found, don't error out. --- lib/ansible/utils/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py index ba65028f9f..811eb7eefc 100644 --- a/lib/ansible/utils/__init__.py +++ b/lib/ansible/utils/__init__.py @@ -833,7 +833,7 @@ def default(value, function): return value -def _gitrepoinfo(repo_path): +def _git_repo_info(repo_path): ''' returns a string containing git branch, commit id and commit date ''' result = None if os.path.exists(repo_path): @@ -877,14 +877,16 @@ def _gitrepoinfo(repo_path): def _gitinfo(): basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..') repo_path = os.path.join(basedir, '.git') - result = _gitrepoinfo(repo_path) + result = _git_repo_info(repo_path) submodules = os.path.join(basedir, '.gitmodules') + if not os.path.exists(submodules): + return result f = open(submodules) for line in f: tokens = line.strip().split(' ') if tokens[0] == 'path': submodule_path = tokens[2] - submodule_info =_gitrepoinfo(os.path.join(basedir, submodule_path, '.git')) + submodule_info =_git_repo_info(os.path.join(basedir, submodule_path, '.git')) if not submodule_info: submodule_info = ' not found - use git submodule update --init ' + submodule_path result += "\n {0}: {1}".format(submodule_path, submodule_info)