diff --git a/salt/fileserver/svnfs.py b/salt/fileserver/svnfs.py index 51a55e9df7..ebebd95c56 100644 --- a/salt/fileserver/svnfs.py +++ b/salt/fileserver/svnfs.py @@ -79,8 +79,8 @@ def __virtual__(): for param in ('svnfs_trunk', 'svnfs_branches', 'svnfs_tags'): if os.path.isabs(__opts__[param]): errors.append( - 'Master configuration parameter {0!r} (value: {1}) cannot be ' - 'an absolute path'.format(param, __opts__[param]) + 'Master configuration parameter \'{0}\' (value: {1}) cannot ' + 'be an absolute path'.format(param, __opts__[param]) ) if errors: for error in errors: @@ -151,7 +151,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) @@ -194,7 +194,7 @@ def init(): new_remote = True except pysvn._pysvn.ClientError as exc: log.error( - 'Failed to initialize svnfs remote {0!r}: {1}' + 'Failed to initialize svnfs remote \'{0}\': {1}' .format(repo_url, exc) ) _failhard() @@ -505,7 +505,7 @@ def envs(ignore_cache=False): ret.add('base') else: 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' .format(repo['trunk'], repo['url']) ) @@ -515,7 +515,7 @@ def envs(ignore_cache=False): ret.update(os.listdir(branches)) else: 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']) ) @@ -524,7 +524,7 @@ def envs(ignore_cache=False): ret.update(os.listdir(tags)) else: 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']) ) return [x for x in sorted(ret) if _env_is_exposed(x)]