From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Aug 2014 20:53:16 +0000 (-0700)
Subject: ceph-disk: fix log syntax error
X-Git-Tag: v0.85~31^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1088d6cd11b476cd67ed30e07edd363c4057a003;p=ceph.git

ceph-disk: fix log syntax error

  File "/usr/sbin/ceph-disk", line 303, in command_check_call
    LOG.info('Running command: %s' % ' '.join(arguments))
TypeError: sequence item 2: expected string, NoneType found

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 689c2bc13184f..6c3775139dac4 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -300,7 +300,7 @@ def command_check_call(arguments):
     otherwise.
     """
     arguments = _get_command_executable(arguments)
-    LOG.info('Running command: %s' % ' '.join(arguments))
+    LOG.info('Running command: %s', ' '.join(arguments))
     return subprocess.check_call(arguments)