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

Remove deprecated CLI option.

Browse Source
This commit is contained in:
Pedro Algarvio 2014-04-24 11:18:11 +01:00
parent 9e9d596c10
commit 3ad35d1e4c
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
salt/utils/parsers.py
View File

@ -1747,20 +1747,6 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
_default_logging_logfile_ = os.path.join(syspaths.LOGS_DIR, 'key')
def _mixin_setup(self):
# XXX: Remove '--key-logfile' support in 2014.1.0
utils.warn_until(
'Hydrogen',
'Remove \'--key-logfile\' support',
_dont_call_warnings=True
)
self.logging_options_group.add_option(
'--key-logfile',
default=None,
help='Send all output to a file. Default is {0!r}'.format(
self._default_logging_logfile_
)
)
actions_group = optparse.OptionGroup(self, 'Actions')
actions_group.add_option(
'-l', '--list',
@ -1946,20 +1932,6 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
# --create-keys-dir
self._mixin_after_parsed_funcs.append(self.__create_keys_dir)
def process_key_logfile(self):
if self.options.key_logfile:
# XXX: Remove '--key-logfile' support in 2014.1.0
# In < 2014.1.0 error out
utils.warn_until(
'Hydrogen',
'Remove \'--key-logfile\' support',
_dont_call_warnings=True
)
self.error(
'The \'--key-logfile\' option has been deprecated in favour '
'of \'--log-file\''
)
def _mixin_after_parsed(self):
# It was decided to always set this to info, since it really all is
# info or error.