salt/fileserver/hgfs.py: remove raw string formatting

This commit is contained in:
Erik Johnson 2015-08-26 23:26:06 -05:00
parent 294bb3fe22
commit 5d24e8e1e5

View File

@ -82,7 +82,7 @@ def __virtual__():
return False
if __opts__['hgfs_branch_method'] not in VALID_BRANCH_METHODS:
log.error(
'Invalid hgfs_branch_method {0!r}. Valid methods are: {1}'
'Invalid hgfs_branch_method \'{0}\'. Valid methods are: {1}'
.format(__opts__['hgfs_branch_method'], VALID_BRANCH_METHODS)
)
return False
@ -217,7 +217,7 @@ def init():
per_remote_defaults['branch_method'])
if branch_method not in VALID_BRANCH_METHODS:
log.error(
'Invalid branch_method {0!r} for remote {1}. Valid '
'Invalid branch_method \'{0}\' for remote {1}. Valid '
'branch methods are: {2}. This remote will be ignored.'
.format(branch_method, repo_url,
', '.join(VALID_BRANCH_METHODS))
@ -228,7 +228,7 @@ def init():
for param in (x for x in per_remote_conf
if x not in PER_REMOTE_PARAMS):
log.error(
'Invalid configuration parameter {0!r} for remote {1}. '
'Invalid configuration parameter \'{0}\' for remote {1}. '
'Valid parameters are: {2}. See the documentation for '
'further information.'.format(
param, repo_url, ', '.join(PER_REMOTE_PARAMS)