support 'den' parameter in salt-key options parser

This commit is contained in:
vs 2014-09-18 19:37:24 +02:00
parent 84753ee9dd
commit fbba6116c0

View File

@ -1723,6 +1723,7 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
'unaccepted/unsigned keys. '
'"acc" or "accepted" will list accepted/signed keys. '
'"rej" or "rejected" will list rejected keys. '
'"den" or "denied" will list denied keys. '
'Finally, "all" will list all keys.')
)
@ -1929,7 +1930,7 @@ class SaltKeyOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
# Filter accepted list arguments as soon as possible
if not self.options.list:
return
if not self.options.list.startswith(('acc', 'pre', 'un', 'rej', 'all')):
if not self.options.list.startswith(('acc', 'pre', 'un', 'rej', 'den', 'all')):
self.error(
'{0!r} is not a valid argument to \'--list\''.format(
self.options.list