valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC

Browse Source
This commit is contained in:
Pedro Algarvio 2012-11-16 21:00:57 +00:00
commit 4023a9d1af
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/cli/__init__.py
View File

@ -181,6 +181,7 @@ class SaltKey(parsers.SaltKeyOptionParser):
verify_env_dirs = [] verify_env_dirs = []
if not self.config['gen_keys']: if not self.config['gen_keys']:
verify_env_dirs.extend([ verify_env_dirs.extend([
self.config['pki_dir'],
os.path.join(self.config['pki_dir'], 'minions'), os.path.join(self.config['pki_dir'], 'minions'),
os.path.join(self.config['pki_dir'], 'minions_pre'), os.path.join(self.config['pki_dir'], 'minions_pre'),
os.path.join(self.config['pki_dir'], 'minions_rejected'), os.path.join(self.config['pki_dir'], 'minions_rejected'),