sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

python/samba/netcmd: PY3 make sure get_testparm_var returns 'str'

Browse Source 
part of PY3 port samba4.blackbox.upgrade.samba3-upgrade*

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-10-10 11:18:13 +01:00 committed by Andrew Bartlett
parent a114ff2182
commit 2c0f7f07c6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/netcmd/domain.py
View File

@ -103,6 +103,7 @@ from samba.netcmd.pso import cmd_domain_passwordsettings_pso
from samba.netcmd.domain_backup import cmd_domain_backup
from samba.compat import binary_type
from samba.compat import get_string
string_version_to_constant = {
"2008_R2": DS_DOMAIN_FUNCTION_2008_R2,
@ -153,9 +154,9 @@ def get_testparm_var(testparm, smbconf, varname):
stdout=subprocess.PIPE, stderr=errfile)
(out, err) = p.communicate()
errfile.close()
lines = out.split('\n')
lines = out.split(b'\n')
if lines:
return lines[0].strip()
return get_string(lines[0]).strip()
return ""