saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add thorium roots to setup.py

Browse source
This commit is contained in:
Thomas S Hatch 2016-02-02 10:49:23 -07:00
parent c0d54c3fb8
commit f126f2011a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup.py
View file

@ -211,6 +211,7 @@ class GenerateSaltSyspaths(Command):
base_file_roots_dir=self.distribution.salt_base_file_roots_dir, base_file_roots_dir=self.distribution.salt_base_file_roots_dir,
base_pillar_roots_dir=self.distribution.salt_base_pillar_roots_dir, base_pillar_roots_dir=self.distribution.salt_base_pillar_roots_dir,
base_master_roots_dir=self.distribution.salt_base_master_roots_dir, base_master_roots_dir=self.distribution.salt_base_master_roots_dir,
base_thorium_roots_dir=self.distribution.salt_base_thorium_roots_dir,
logs_dir=self.distribution.salt_logs_dir, logs_dir=self.distribution.salt_logs_dir,
pidfile_dir=self.distribution.salt_pidfile_dir, pidfile_dir=self.distribution.salt_pidfile_dir,
spm_formula_path=self.distribution.salt_spm_formula_dir, spm_formula_path=self.distribution.salt_spm_formula_dir,
@ -629,6 +630,7 @@ SRV_ROOT_DIR= {srv_root_dir!r}
BASE_FILE_ROOTS_DIR = {base_file_roots_dir!r} BASE_FILE_ROOTS_DIR = {base_file_roots_dir!r}
BASE_PILLAR_ROOTS_DIR = {base_pillar_roots_dir!r} BASE_PILLAR_ROOTS_DIR = {base_pillar_roots_dir!r}
BASE_MASTER_ROOTS_DIR = {base_master_roots_dir!r} BASE_MASTER_ROOTS_DIR = {base_master_roots_dir!r}
BASE_THORIUM_ROOTS_DIR = {base_thorium_roots_dir!r}
LOGS_DIR = {logs_dir!r} LOGS_DIR = {logs_dir!r}
PIDFILE_DIR = {pidfile_dir!r} PIDFILE_DIR = {pidfile_dir!r}
SPM_FORMULA_PATH = {spm_formula_path!r} SPM_FORMULA_PATH = {spm_formula_path!r}
@ -697,6 +699,7 @@ class Install(install):
self.salt_sock_dir = None self.salt_sock_dir = None
self.salt_srv_root_dir = None self.salt_srv_root_dir = None
self.salt_base_file_roots_dir = None self.salt_base_file_roots_dir = None
self.salt_base_thorium_roots_dir = None
self.salt_base_pillar_roots_dir = None self.salt_base_pillar_roots_dir = None
self.salt_base_master_roots_dir = None self.salt_base_master_roots_dir = None
self.salt_logs_dir = None self.salt_logs_dir = None
@ -708,7 +711,7 @@ class Install(install):
logged_warnings = False logged_warnings = False
for optname in ('root_dir', 'config_dir', 'cache_dir', 'sock_dir', for optname in ('root_dir', 'config_dir', 'cache_dir', 'sock_dir',
'srv_root_dir', 'base_file_roots_dir', 'srv_root_dir', 'base_file_roots_dir', 'base_thorium_roots_dir',
'base_pillar_roots_dir', 'base_master_roots_dir', 'base_pillar_roots_dir', 'base_master_roots_dir',
'logs_dir', 'pidfile_dir'): 'logs_dir', 'pidfile_dir'):
optvalue = getattr(self, 'salt_{0}'.format(optname)) optvalue = getattr(self, 'salt_{0}'.format(optname))
@ -859,6 +862,7 @@ class SaltDistribution(distutils.dist.Distribution):
self.salt_sock_dir = None self.salt_sock_dir = None
self.salt_srv_root_dir = None self.salt_srv_root_dir = None
self.salt_base_file_roots_dir = None self.salt_base_file_roots_dir = None
self.salt_base_thorium_roots_dir = None
self.salt_base_pillar_roots_dir = None self.salt_base_pillar_roots_dir = None
self.salt_base_master_roots_dir = None self.salt_base_master_roots_dir = None
self.salt_logs_dir = None self.salt_logs_dir = None