Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix --list all option #11018

Merged
merged 1 commit into from

5 participants

@cachedout
Owner

Fixes #10982

@salt-jenkins
Owner

Test FAILed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/2109/

@techhat techhat merged commit 040d8ae into from
@techhat
Owner

Thanks @cachedout!

@gtmanfred

Was this ported back into 2014.1.1?

It doesn't appear to be.

@basepi
Owner

It did not. I will get it into 2014.1.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 6, 2014
  1. @cachedout

    Fix --list all option

    cachedout authored
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 1 deletion.
  1. +2 −0  salt/key.py
  2. +1 −1  salt/utils/parsers.py
View
2  salt/key.py
@@ -52,6 +52,8 @@ def list_status(self, status):
'key',
self.opts
)
+ elif status.startswith('all'):
+ self.list_all()
def list_all(self):
'''
View
2  salt/utils/parsers.py
@@ -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
Something went wrong with that request. Please try again.