valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erik Johnson 2015-08-26 23:26:06 -05:00
parent b34c178139
commit de97332105
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/fileserver/svnfs.py
View File

@ -79,8 +79,8 @@ def __virtual__():
for param in ('svnfs_trunk', 'svnfs_branches', 'svnfs_tags'): for param in ('svnfs_trunk', 'svnfs_branches', 'svnfs_tags'):
if os.path.isabs(__opts__[param]): if os.path.isabs(__opts__[param]):
errors.append( errors.append(
'Master configuration parameter {0!r} (value: {1}) cannot be ' 'Master configuration parameter \'{0}\' (value: {1}) cannot '
'an absolute path'.format(param, __opts__[param]) 'be an absolute path'.format(param, __opts__[param])
) )
if errors: if errors:
for error in errors: for error in errors:
@ -151,7 +151,7 @@ def init():
for param in (x for x in per_remote_conf for param in (x for x in per_remote_conf
if x not in PER_REMOTE_PARAMS): if x not in PER_REMOTE_PARAMS):
log.error( 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 ' 'Valid parameters are: {2}. See the documentation for '
'further information.'.format( 'further information.'.format(
param, repo_url, ', '.join(PER_REMOTE_PARAMS) param, repo_url, ', '.join(PER_REMOTE_PARAMS)
@ -194,7 +194,7 @@ def init():
new_remote = True new_remote = True
except pysvn._pysvn.ClientError as exc: except pysvn._pysvn.ClientError as exc:
log.error( log.error(
'Failed to initialize svnfs remote {0!r}: {1}' 'Failed to initialize svnfs remote \'{0}\': {1}'
.format(repo_url, exc) .format(repo_url, exc)
) )
_failhard() _failhard()
@ -505,7 +505,7 @@ def envs(ignore_cache=False):
ret.add('base') ret.add('base')
else: else:
log.error( log.error(
'svnfs trunk path {0!r} does not exist in repo {1}, no base ' 'svnfs trunk path \'{0}\' does not exist in repo {1}, no base '
'environment will be provided by this remote' 'environment will be provided by this remote'
.format(repo['trunk'], repo['url']) .format(repo['trunk'], repo['url'])
) )
@ -515,7 +515,7 @@ def envs(ignore_cache=False):
ret.update(os.listdir(branches)) ret.update(os.listdir(branches))
else: else:
log.error( log.error(
'svnfs branches path {0!r} does not exist in repo {1}' 'svnfs branches path \'{0}\' does not exist in repo {1}'
.format(repo['branches'], repo['url']) .format(repo['branches'], repo['url'])
) )
@ -524,7 +524,7 @@ def envs(ignore_cache=False):
ret.update(os.listdir(tags)) ret.update(os.listdir(tags))
else: else:
log.error( log.error(
'svnfs tags path {0!r} does not exist in repo {1}' 'svnfs tags path \'{0}\' does not exist in repo {1}'
.format(repo['tags'], repo['url']) .format(repo['tags'], repo['url'])
) )
return [x for x in sorted(ret) if _env_is_exposed(x)] return [x for x in sorted(ret) if _env_is_exposed(x)]