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

ceph-disk: fix Error() messages formatting

Browse Source 
Mainly using % instead of ,

Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2013-12-30 16:57:36 +01:00
parent 6b8d4188db
commit b82ccfbfa7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ceph-disk
View File

@ -514,7 +514,7 @@ def check_osd_id(osd_id):
Ensures osd id is numeric. Ensures osd id is numeric.
""" """
if not re.match(r'^[0-9]+$', osd_id): 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( def allocate_osd_id(
@ -1013,7 +1013,7 @@ def prepare_journal(
raise Error('Journal is not a regular file', journal) raise Error('Journal is not a regular file', journal)
return prepare_journal_dev(data, journal, journal_size, journal_uuid, journal_dm_keypath) 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): def adjust_symlink(target, path):
@ -1808,7 +1808,7 @@ def main_activate(args):
osd_id = None osd_id = None
if not os.path.exists(args.path): 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): if is_suppressed(args.path):
LOG.info('suppressed activate request on %s', args.path) LOG.info('suppressed activate request on %s', args.path)
@ -1830,7 +1830,7 @@ def main_activate(args):
init=args.mark_init, init=args.mark_init,
) )
else: 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( start_daemon(
cluster=cluster, cluster=cluster,
@ -1846,11 +1846,11 @@ def main_activate(args):
def get_journal_osd_uuid(path): def get_journal_osd_uuid(path):
if not os.path.exists(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 mode = os.stat(path).st_mode
if not stat.S_ISBLK(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: try:
out = _check_output( out = _check_output(
@ -1874,7 +1874,7 @@ def get_journal_osd_uuid(path):
def main_activate_journal(args): def main_activate_journal(args):
if not os.path.exists(args.dev): 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 cluster = None
osd_id = None osd_id = None