summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-05-24 12:41:11 +0200
committerSage Weil <sage@inktank.com>2013-06-14 14:11:05 -0700
commitecddd1e0062ae58e8cc75e125cc683fc04b8befe (patch)
tree4abb9c9eb114f06bd1f8af5dd92db27c0f1bdf52
parent43855e3788cc90900f1b3424c4e4e2c28e8f351e (diff)
downloadceph-ecddd1e0062ae58e8cc75e125cc683fc04b8befe.tar.gz
ceph-disk: cast output of _check_output()
Cast output of _check_output() to str() to be able to use str.split(). Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 16ecae153d260407085aaafbad1c1c51f4486c9a)
-rwxr-xr-xsrc/ceph-disk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 26324514665..23cfd5670e1 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -786,7 +786,7 @@ def prepare_journal_dev(
'--name={name}'.format(name=os.path.basename(journal)),
],
)
- journal_symlink = '/dev/{symlink}-part{num}'.format(symlink=symlinks.split()[2], num=num)
+ journal_symlink = '/dev/{symlink}-part{num}'.format(symlink=str(symlinks).split()[2], num=num)
journal_dmcrypt = None
if journal_dm_keypath: