From 0ab2ba73018675187ed932dc0b421488af17600a Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Sun, 16 Aug 2015 19:00:00 +0200
Subject: Py3 compatibility: encode output of subprocess call

In Python 3 subprocess.Popen() and check_out() return bytes. The rest of
PKI expects text, so the output has to be decoded.

- ascii for dnsdomainname
- sys.getfilesystemencoding() for paths
- utf-8 for the rest
---
 base/server/upgrade/10.1.99/03-AddedRESTEasyClient | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'base/server/upgrade/10.1.99/03-AddedRESTEasyClient')

diff --git a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
index 40169bc66..c38e0a62f 100755
--- a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
+++ b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 import os
+import sys
 import subprocess
 
 import pki.server.upgrade
@@ -41,8 +42,9 @@ class AddedRESTEasyClient(pki.server.upgrade.PKIServerUpgradeScriptlet):
         resteasy_lib = subprocess.check_output(
             '. /etc/pki/pki.conf && echo $RESTEASY_LIB',
             shell=True)
+        resteasy_lib = resteasy_lib.decode(sys.getfilesystemencoding())
         # workaround for pylint error E1103
-        resteasy_lib = str(resteasy_lib).strip()
+        resteasy_lib = resteasy_lib.strip()
 
         # create new links
         source = os.path.join(resteasy_lib, 'resteasy-client.jar')
-- 
cgit