IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipautil.run, kernel_keyring: Encoding fixes for Python 3

Browse Source 
https://fedorahosted.org/freeipa/ticket/5638

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin
2016-01-26 13:56:54 +01:00
committed by Jan Cholasta
parent fe7bd36728
commit d3851fd76f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipapython/kernel_keyring.py
View File

@@ -50,7 +50,7 @@ def get_real_key(key):
raiseonerr=False, capture_output=True)
if result.returncode:
raise ValueError('key %s not found' % key)
return result.output.rstrip()
return result.raw_output.rstrip()
def get_persistent_key(key):
assert isinstance(key, str)
@@ -58,7 +58,7 @@ def get_persistent_key(key):
raiseonerr=False, capture_output=True)
if result.returncode:
raise ValueError('persistent key %s not found' % key)
return result.output.rstrip()
return result.raw_output.rstrip()
def is_persistent_keyring_supported():
uid = os.geteuid()
@@ -93,7 +93,7 @@ def read_key(key):
if result.returncode:
raise ValueError('keyctl pipe failed: %s' % result.error_log)
return result.output
return result.raw_output
def update_key(key, value):
"""