From 3ad35d1e4c9d6e0f9c863df07c2a23f2e78b3423 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 24 Apr 2014 11:18:11 +0100
Subject: [PATCH] Remove deprecated CLI option.

---
 salt/utils/parsers.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/salt/utils/parsers.py b/salt/utils/parsers.py
index 6357a19eaf..c3e82c30af 100644
--- a/salt/utils/parsers.py
+++ b/salt/utils/parsers.py
@@ -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.