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

Use shorter version of salt-run command in warning

Browse Source
This commit is contained in:
Erik Johnson 2015-02-21 23:23:54 -06:00 committed by C. R. Oldham
parent 537a78ec5c
commit d61cc123f0
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/fileserver/gitfs.py
View File

@ -1031,9 +1031,8 @@ def update():
'Update lockfile is present for gitfs remote {0}, skipping. '
'If this warning persists, it is possible that the update '
'process was interrupted. Removing {1} or running '
'\'salt-run fileserver.clear_lock backend=git\' will allow '
'updates to continue for this remote.'
.format(repo['url'], lk_fn)
'\'salt-run fileserver.clear_lock gitfs\' will allow updates '
'to continue for this remote.'.format(repo['url'], lk_fn)
)
continue
try:

5
salt/fileserver/hgfs.py
View File

@ -389,9 +389,8 @@ def update():
'Update lockfile is present for hgfs remote {0}, skipping. '
'If this warning persists, it is possible that the update '
'process was interrupted. Removing {1} or running '
'\'salt-run fileserver.clear_lock backend=hg\' will allow '
'updates to continue for this remote.'
.format(repo['url'], lk_fn)
'\'salt-run fileserver.clear_lock hgfs\' will allow updates '
'to continue for this remote.'.format(repo['url'], lk_fn)
)
continue
with salt.utils.fopen(lk_fn, 'w+') as fp_:

5
salt/fileserver/svnfs.py
View File

@ -319,9 +319,8 @@ def update():
'Update lockfile is present for svn remote {0}, skipping. '
'If this warning persists, it is possible that the update '
'process was interrupted. Removing {1} or running '
'\'salt-run fileserver.clear_lock backend=svn\' will allow '
'updates to continue for this remote.'
.format(repo['url'], lk_fn)
'\'salt-run fileserver.clear_lock svnfs\' will allow updates '
'to continue for this remote.'.format(repo['url'], lk_fn)
)
continue
with salt.utils.fopen(lk_fn, 'w+') as fp_: