valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6915 from s0undt3ch/features/improve-packaging

Browse Source 
Store salt related path configurations in the `distribution` object
This commit is contained in:
Thomas S Hatch 2013-08-27 08:35:41 -07:00
commit 0542eade3d
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
setup.py
View File

@ -177,16 +177,16 @@ class Build(build):
open(system_paths_file_path, 'w').write( open(system_paths_file_path, 'w').write(
install_syspaths_template.format( install_syspaths_template.format(
date=datetime.utcnow(), date=datetime.utcnow(),
root_dir=self.salt_root_dir, root_dir=self.distribution.salt_root_dir,
config_dir=self.salt_config_dir, config_dir=self.distribution.salt_config_dir,
cache_dir=self.salt_cache_dir, cache_dir=self.distribution.salt_cache_dir,
sock_dir=self.salt_sock_dir, sock_dir=self.distribution.salt_sock_dir,
srv_root_dir=self.salt_srv_root_dir, srv_root_dir=self.distribution.salt_srv_root_dir,
base_file_roots_dir=self.salt_base_file_roots_dir, base_file_roots_dir=self.distribution.salt_base_file_roots_dir,
base_pillar_roots_dir=self.salt_base_pillar_roots_dir, base_pillar_roots_dir=self.distribution.salt_base_pillar_roots_dir,
base_master_roots_dir=self.salt_base_master_roots_dir, base_master_roots_dir=self.distribution.salt_base_master_roots_dir,
logs_dir=self.salt_logs_dir, logs_dir=self.distribution.salt_logs_dir,
pidfile_dir=self.salt_pidfile_dir, pidfile_dir=self.distribution.salt_pidfile_dir,
) )
) )
@ -231,14 +231,17 @@ class Install(install):
def finalize_options(self): def finalize_options(self):
install.finalize_options(self) install.finalize_options(self)
for optname in ('root_dir', 'config_dir', 'cache_dir', 'sock_dir', for optname in ('root_dir', 'config_dir', 'cache_dir', 'sock_dir',
'base_file_roots_dir', 'base_pillar_roots_dir', 'srv_root_dir', 'base_file_roots_dir',
'base_master_roots_dir', 'logs_dir', 'pidfile_dir'): 'base_pillar_roots_dir', 'base_master_roots_dir',
if not getattr(self, 'salt_{0}'.format(optname)): 'logs_dir', 'pidfile_dir'):
optvalue = getattr(self, 'salt_{0}'.format(optname))
if not optvalue:
raise RuntimeError( raise RuntimeError(
'The value of --salt-{0} needs a proper path value'.format( 'The value of --salt-{0} needs a proper path value'.format(
optname.replace('_', '-') optname.replace('_', '-')
) )
) )
setattr(self.distribution, 'salt_{0}'.format(optname), optvalue)
def run(self): def run(self):
# Let's set the running_salt_install attribute so we can add # Let's set the running_salt_install attribute so we can add