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

This commit is contained in:
Pedro Algarvio 2012-11-16 21:00:57 +00:00
commit 4023a9d1af

View File

@ -181,6 +181,7 @@ class SaltKey(parsers.SaltKeyOptionParser):
verify_env_dirs = []
if not self.config['gen_keys']:
verify_env_dirs.extend([
self.config['pki_dir'],
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_rejected'),