diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-02-23 20:20:57 +0100 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2016-02-23 20:20:57 +0100 |
| commit | b96bcf71fcfd23eb2e5c636f8eee626c11c14960 (patch) | |
| tree | 0b0dab36f84d2b299d0b38eba2cd115598c7282e /base/server/python | |
| parent | da4ca36ef5e378f55259438b4f72491d0966e5e7 (diff) | |
| download | pki-b96bcf71fcfd23eb2e5c636f8eee626c11c14960.tar.gz pki-b96bcf71fcfd23eb2e5c636f8eee626c11c14960.tar.xz pki-b96bcf71fcfd23eb2e5c636f8eee626c11c14960.zip | |
Python 3 fix for Tomcat.get_major_version()
I forgot to decode the output of subprocess.check_call(). All other
places decode bytes to text properly.
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index cb246aaa1..26418d45c 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -471,6 +471,7 @@ class Tomcat(object): # run "tomcat version" output = subprocess.check_output(['/usr/sbin/tomcat', 'version']) + output = output.decode('utf-8') # find "Server version: Apache Tomcat/<major version>.<minor version>" match = re.search(r'^Server version:[^/]*/(\d+).*$', output, re.MULTILINE) |