RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: cast output of subprocess.Popen() to str()

Browse Source 
Cast output of subprocess.Popen() to str() to be able to use
str.split() and str.splitlines() without warnings from pylint.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
This commit is contained in:
Danny Al-Gaaf 2013-03-20 14:36:58 +01:00
parent 3575feb7d2
commit 87691dc46e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ceph-disk
View File

@ -373,7 +373,7 @@ def get_conf(cluster, variable):
return None
elif ret != 0:
raise Error('getting variable from configuration failed')
value = out.split('\n', 1)[0]
value = str(out).split('\n', 1)[0]
# don't differentiate between "var=" and no var set
if not value:
return None
@ -406,7 +406,7 @@ def get_conf_with_default(cluster, variable):
e,
)
value = out.split('\n', 1)[0]
value = str(out).split('\n', 1)[0]
return value
@ -552,7 +552,7 @@ def get_free_partition_index(dev):
if not lines:
raise Error('parted failed to output anything')
lines = lines.splitlines(True)
lines = str(lines).splitlines(True)
if lines[0] not in ['CHS;\n', 'CYL;\n', 'BYT;\n']:
raise Error('weird parted units', lines[0])