openstack/openstack-ansible
Code Issues Proposed changes

Merge "Replace deprecated library function os.popen() with subprocess"

Browse Source
This commit is contained in:
Zuul 2018-05-19 23:09:22 +00:00 committed by Gerrit Code Review
commit 9971d292a8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy-guide/source/conf.py
View File

@ -24,6 +24,7 @@
import os
import sys
import subprocess
import openstackdocstheme
@ -51,7 +52,8 @@ if current_series == "latest":
suse_series = previous_series_name.capitalize()
else:
watermark = series_names = current_series.capitalize()
latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
git_cmd = ["git", "describe", "--abbrev=0", "--tags"]
latest_tag = subprocess.Popen(git_cmd,stdout=subprocess.PIPE).communicate()[0].strip('\n')
rdo_series = current_series_name
suse_series = current_series_name.capitalize()

4
doc/source/conf.py
View File

@ -26,6 +26,7 @@ import imp
import os
import re
import sys
import subprocess
import openstackdocstheme
@ -53,7 +54,8 @@ if current_series == "latest":
upgrade_warning = "Upgrading to master is not recommended. Master is under heavy development, and is not stable."
else:
watermark = series_names = current_series.capitalize()
latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
git_cmd = ["git", "describe", "--abbrev=0", "--tags"]
latest_tag = subprocess.Popen(git_cmd,stdout=subprocess.PIPE).communicate()[0].strip('\n')
branch = "stable/{}".format(current_series)
upgrade_warning = "The upgrade is always under active development."