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

Add missing quotes and full is not deprecated

Browse Source
This commit is contained in:
Pedro Algarvio 2015-09-03 15:56:49 +01:00
parent dc0fec3be3
commit 19019e8f92
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/event.py
View File

@ -275,7 +275,7 @@ class SaltEvent(object):
if match_type is not None and match_type != 'fnmatch':
raise RuntimeError(
'When not passing a tag, make sure '
'\'match_type\' is \'None\' or \'fnmatch\.'
'\'match_type\' is \'None\' or \'fnmatch\'.'
)
match_type = 'fnmatch'
match_func = self._get_match_func(match_type)
@ -290,7 +290,7 @@ class SaltEvent(object):
if match_type is not None and match_type != 'fnmatch':
raise RuntimeError(
'When not passing a tag, make sure '
'\'match_type\' is \'None\' or \'fnmatch\.'
'\'match_type\' is \'None\' or \'fnmatch\'.'
)
match_type = 'fnmatch'
match_func = self._get_match_func(match_type)
@ -451,7 +451,7 @@ class SaltEvent(object):
def get_event(self,
wait=5,
tag='',
full=None,
full=True,
use_pending=None,
pending_tags=None,
match_type=None,
@ -500,12 +500,6 @@ class SaltEvent(object):
request, it MUST subscribe the result to ensure the response is not lost
should other regions of code call get_event for other purposes.
'''
if full is not None:
salt.utils.warn_until(
'Nitrogen',
'The \'full\' keyword argument is deprecated and is simply ignored. '
'Please stop using it since it\'s support will be removed in {version}.'
)
if use_pending is not None:
salt.utils.warn_until(
'Nitrogen',