af1cbef67a
* Updated from global requirements * Fix regression handling relative paths in environment * Update .gitreview for stable/mitaka * Use poll_for_events for "openstack stack delete" * Add OSC plugin for openstack orchestation service list * Add OSC plugin for openstack orchestation build info * Strip any whitespace before checking for json * Add OSC plugin for stack resource mark unhealthy * Implement stack event list --follow * Replace assertEqual(None, *) with assertIsNone * Prompt user before deleting stack if tty * Add more readonly openstack client funcitonal tests * Use poll_for_events for "openstack stack <action>" * Use poll_for_events for "openstack stack adopt" * Use poll_for_events for "openstack stack update" * Use poll_for_events for "openstack stack create" * poll_for_events fall back to stack get * Fix collision with update and update cancel * Update OSC metavars * OpenstackClient plugin for software deployment output show * Move poll_for_events to event_utils * Adds --filter to search for resources * Stack resource search * OpenstackClient plugin for software deployment metadata show * Add stack hook poll and clear to openstack client * OpenstackClient plugin for deployment create * Remove the only-value flag of output-show * Changes to support server-side environment resolution * OSC plugin for stack snapshot delete OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-heatclient?expand=0&rev=31
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
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
|
|
|