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

Merge pull request #31922 from cachedout/issue_31890_1

Browse Source 
For 2015.8 head
This commit is contained in:
Nicole Thomas 2016-03-16 13:07:11 -06:00
commit 390ef9fea7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/fileclient.py
View File

@ -677,7 +677,7 @@ class Client(object):
**get_kwargs **get_kwargs
) )
if 'handle' not in query: if 'handle' not in query:
raise MinionError('Error: {0}'.format(query['error'])) raise MinionError('Error: {0} reading {1}'.format(query['error'], url))
if no_cache: if no_cache:
return ''.join(result) return ''.join(result)
else: else: