Thomas Bechtold 2016-09-07 12:33:55 +00:00 committed by Git OBS Bridge
parent 6631230081
commit 2138e1f911
2 changed files with 0 additions and 48 deletions

View File

@ -1,46 +0,0 @@
From 43862612783a0021664b7ece442681cff4899003 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 13 Jul 2016 17:07:42 +0200
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: If6585c62ed783f38b2b80afa7fc9795f7e9426a6
Closes-Bug: #1552251
---
doc/source/conf.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e483b53..8bb3fe4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,6 +25,7 @@
import os
import subprocess
+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
@@ -149,8 +150,13 @@ html_theme_options = {
# 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 Exception:
+ 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.
--
2.9.0

View File

@ -1,2 +0,0 @@
# This symling is for the -test package and can be ignored:
addFilter("dangling-symlink /var/lib/python-heatclient-test/heatclient")