Permalink
Browse files

Merge pull request #11018 from cachedout/10982

Fix --list all option
  • Loading branch information...
techhat committed Mar 7, 2014
2 parents fc0b4b7 + f7b5cdf commit 040d8ae742c28430019ae0fcb806f3def5e378cd
Showing with 3 additions and 1 deletion.
  1. +2 −0 salt/key.py
  2. +1 −1 salt/utils/parsers.py
View
@@ -52,6 +52,8 @@ def list_status(self, status):
'key',
self.opts
)
+ elif status.startswith('all'):
+ self.list_all()
def list_all(self):
'''
View
@@ -1934,7 +1934,7 @@ def process_list(self):
# Filter accepted list arguments as soon as possible
if not self.options.list:
return
- if not self.options.list.startswith(('acc', 'pre', 'un', 'rej')):
+ if not self.options.list.startswith(('acc', 'pre', 'un', 'rej', 'all')):
self.error(
'{0!r} is not a valid argument to \'--list\''.format(
self.options.list

0 comments on commit 040d8ae

Please sign in to comment.