From a1ed76f1cbb3dcd5b4253920278b8bc4f32978a2 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Thu, 28 Apr 2016 06:29:41 +0800 Subject: [PATCH] Fix doc build if git is absent When building packages if git is absent, then we should not set html_last_updated_fmt. It can still be set via the -D switch when building with sphinx-build. Change-Id: I5d0b6cc87f27a052d6d0265546c0d347f00c4bb8 Closes-Bug: #1552251 --- doc/source/conf.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index b5e0d6f071..ec93ed1b7e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -31,6 +31,7 @@ import os from swift import __version__ import subprocess import sys +import warnings # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -160,8 +161,12 @@ modindex_common_prefix = ['swift.'] # html_last_updated_fmt = '%b %d, %Y' git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"] -html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0] +try: + html_last_updated_fmt = subprocess.Popen( + git_cmd, stdout=subprocess.PIPE).communicate()[0] +except OSError: + warnings.warn('Cannot get last updated time from git repository. ' + 'Not setting "html_last_updated_fmt".') # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities.