openstack/manila
Code Issues Proposed changes

Remove the deprecated "giturl" option

Browse Source 
From openstackdocstheme 1.18.0, valid Git URLs can be retrieved by
openstackdocstheme[1], we do not need giturl option anymore.

[1] https://review.openstack.org/532163

Change-Id: I11d4af5807a2f95dd6e6d06ae5c5f9a9ea45e2f9
This commit is contained in:
zhang.lei 2018-01-15 02:54:08 +00:00 committed by Tom Barron
parent 163e60681a
commit f09d6ab951
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/conf.py
View File

@ -103,25 +103,21 @@ version = version_info.version_string()
# A few variables have to be set for the log-a-bug feature. # A few variables have to be set for the log-a-bug feature.
# giturl: The location of conf.py on Git. Must be set manually.
# gitsha: The SHA checksum of the bug description. Automatically extracted # gitsha: The SHA checksum of the bug description. Automatically extracted
# from git log. # from git log.
# bug_tag: Tag for categorizing the bug. Must be set manually. # bug_tag: Tag for categorizing the bug. Must be set manually.
# These variables are passed to the logabug code via html_context. # These variables are passed to the logabug code via html_context.
giturl = u'https://git.openstack.org/cgit/openstack/manila/tree/doc/source'
git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
try: try:
gitsha = os.popen(git_cmd).read().strip('\n') gitsha = os.popen(git_cmd).read().strip('\n')
except Exception: except Exception:
warnings.warn('Cannot get gitsha.') warnings.warn('Cannot get gitsha.')
gitsha = 'unknown' gitsha = 'unknown'
# source tree
pwd = os.getcwd() pwd = os.getcwd()
html_context = { html_context = {
"pwd": pwd, "pwd": pwd,
"gitsha": gitsha, "gitsha": gitsha,
"bug_tag": bug_tag, "bug_tag": bug_tag,
"giturl": giturl,
"bug_project": bug_project, "bug_project": bug_project,
} }

4
doc/source/install/conf.py
View File

@ -68,21 +68,17 @@ version = '0.1'
release = '0.1' release = '0.1'
# A few variables have to be set for the log-a-bug feature. # A few variables have to be set for the log-a-bug feature.
# giturl: The location of conf.py on Git. Must be set manually.
# gitsha: The SHA checksum of the bug description. Automatically # gitsha: The SHA checksum of the bug description. Automatically
# extracted from git log. # extracted from git log.
# bug_tag: Tag for categorizing the bug. Must be set manually. # bug_tag: Tag for categorizing the bug. Must be set manually.
# These variables are passed to the logabug code via html_context. # These variables are passed to the logabug code via html_context.
giturl = u'https://git.openstack.org/cgit/openstack/manila/tree/install-guide/source'
git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
gitsha = os.popen(git_cmd).read().strip('\n') gitsha = os.popen(git_cmd).read().strip('\n')
# source tree
pwd = os.getcwd() pwd = os.getcwd()
html_context = { html_context = {
"pwd": pwd, "pwd": pwd,
"gitsha": gitsha, "gitsha": gitsha,
"bug_tag": bug_tag, "bug_tag": bug_tag,
"giturl": giturl,
"bug_project": "manila", "bug_project": "manila",
} }