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

Marked specific places which need code removal on salt >= 0.18

Browse Source
This commit is contained in:
Pedro Algarvio 2013-07-20 16:31:28 +01:00
parent 83004fd8f8
commit df5ab04100
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/utils/parsers.py
View File

@ -15,7 +15,6 @@ import os
import sys import sys
import logging import logging
import optparse import optparse
import warnings
import traceback import traceback
from functools import partial from functools import partial
@ -1137,6 +1136,7 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
def _mixin_setup(self): def _mixin_setup(self):
# XXX: Remove '--key-logfile' support in 0.18.0 # XXX: Remove '--key-logfile' support in 0.18.0
utils.warn_until((0, 18), '', _dont_call_warnings=True)
self.logging_options_group.add_option( self.logging_options_group.add_option(
'--key-logfile', '--key-logfile',
default=None, default=None,
@ -1312,6 +1312,7 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
if self.options.key_logfile: if self.options.key_logfile:
# XXX: Remove '--key-logfile' support in 0.18.0 # XXX: Remove '--key-logfile' support in 0.18.0
# In < 0.18.0 error out # In < 0.18.0 error out
utils.warn_until((0, 18), '', _dont_call_warnings=True)
self.error( self.error(
'The \'--key-logfile\' option has been deprecated in favour ' 'The \'--key-logfile\' option has been deprecated in favour '
'of \'--log-file\'' 'of \'--log-file\''