From d61cc123f097438c3496522f6538a603a101b905 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Sat, 21 Feb 2015 23:23:54 -0600 Subject: [PATCH] Use shorter version of salt-run command in warning --- salt/fileserver/gitfs.py | 5 ++--- salt/fileserver/hgfs.py | 5 ++--- salt/fileserver/svnfs.py | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/salt/fileserver/gitfs.py b/salt/fileserver/gitfs.py index 584fa2a7d3..737471be3b 100644 --- a/salt/fileserver/gitfs.py +++ b/salt/fileserver/gitfs.py @@ -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: diff --git a/salt/fileserver/hgfs.py b/salt/fileserver/hgfs.py index cb28518d9d..f1c4d7b991 100644 --- a/salt/fileserver/hgfs.py +++ b/salt/fileserver/hgfs.py @@ -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_: diff --git a/salt/fileserver/svnfs.py b/salt/fileserver/svnfs.py index 0daa8241ea..4f5eb87ab6 100644 --- a/salt/fileserver/svnfs.py +++ b/salt/fileserver/svnfs.py @@ -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_: