saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Include DEPRECATED in the deprecated output options.

Browse source
This commit is contained in:
Pedro Algarvio 2012-11-26 00:37:57 +00:00
parent fd283e9689
commit 65d5e6dcc9
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/utils/parsers.py
View file

@ -549,9 +549,9 @@ class OutputOptionsMixIn(object):
'--raw-out',
default=False,
action='store_true',
help=('Print the output from the \'{0}\' command in raw python '
'form, this is suitable for re-reading the output into an '
'executing python script with eval.'.format(
help=('DEPRECATED. Print the output from the \'{0}\' command in '
'raw python form, this is suitable for re-reading the '
'output into an executing python script with eval.'.format(
self.get_prog_name()
))
)
@ -559,25 +559,26 @@ class OutputOptionsMixIn(object):
'--yaml-out',
default=False,
action='store_true',
help='Print the output from the \'{0}\' command in yaml.'.format(
self.get_prog_name()
)
help=('DEPRECATED. Print the output from the \'{0}\' command in '
'yaml.'.format(self.get_prog_name()))
)
group.add_option(
'--json-out',
default=False,
action='store_true',
help='Print the output from the \'{0}\' command in json.'.format(
self.get_prog_name()
)
help=('DEPRECATED. Print the output from the \'{0}\' command in '
'json.'.format(self.get_prog_name()))
)
if self._include_text_out_:
group.add_option(
'--text-out',
default=False,
action='store_true',
help=('Print the output from the \'{0}\' command in the same '
'form the shell would.'.format(self.get_prog_name()))
help=('DEPRECATED. Print the output from the \'{0}\' command '
'in the same form the shell would.'.format(
self.get_prog_name()
))
)
outputters = loader.outputters(