mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
support 'den' parameter in salt-key options parser
This commit is contained in:
parent
84753ee9dd
commit
fbba6116c0
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user