From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 15:57:36 +0000 (+0100)
Subject: ceph-disk: fix Error() messages formatting
X-Git-Tag: v0.67.6~1^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75bdb5430d9403bed8bd2ccd6a9c5a30d63a189e;p=ceph.git

ceph-disk: fix Error() messages formatting

Mainly using % instead of ,

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit b82ccfbfa786cd5436b48ec38276c5a48028ce1d)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 920a8894785..8b9c5c62e93 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -514,7 +514,7 @@ def check_osd_id(osd_id):
     Ensures osd id is numeric.
     """
     if not re.match(r'^[0-9]+$', osd_id):
-        raise Error('osd id is not numeric')
+        raise Error('osd id is not numeric', osd_id)
 
 
 def allocate_osd_id(
@@ -1016,7 +1016,7 @@ def prepare_journal(
             raise Error('Journal is not a regular file', journal)
         return prepare_journal_dev(data, journal, journal_size, journal_uuid, journal_dm_keypath)
 
-    raise Error('Journal %s is neither a block device nor regular file', journal)
+    raise Error('Journal %s is neither a block device nor regular file' % journal)
 
 
 def adjust_symlink(target, path):
@@ -1811,7 +1811,7 @@ def main_activate(args):
     osd_id = None
 
     if not os.path.exists(args.path):
-        raise Error('%s does not exist', args.path)
+        raise Error('%s does not exist' % args.path)
 
     if is_suppressed(args.path):
         LOG.info('suppressed activate request on %s', args.path)
@@ -1833,7 +1833,7 @@ def main_activate(args):
                 init=args.mark_init,
                 )
         else:
-            raise Error('%s is not a directory or block device', args.path)
+            raise Error('%s is not a directory or block device' % args.path)
 
         start_daemon(
             cluster=cluster,
@@ -1849,11 +1849,11 @@ def main_activate(args):
 
 def get_journal_osd_uuid(path):
     if not os.path.exists(path):
-        raise Error('%s does not exist', path)
+        raise Error('%s does not exist' % path)
 
     mode = os.stat(path).st_mode
     if not stat.S_ISBLK(mode):
-        raise Error('%s is not a block device', path)
+        raise Error('%s is not a block device' % path)
 
     try:
         out = _check_output(
@@ -1877,7 +1877,7 @@ def get_journal_osd_uuid(path):
 
 def main_activate_journal(args):
     if not os.path.exists(args.dev):
-        raise Error('%s does not exist', args.dev)
+        raise Error('%s does not exist' % args.dev)
 
     cluster = None
     osd_id = None