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

Fix paths from SPM files PR

Browse source
This commit is contained in:
Joseph Hall 2017-03-02 05:17:42 -07:00
parent 2d711782e8
commit 7ebf1cf104
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/syspaths.py
View file

@ -139,6 +139,7 @@ if SPM_REACTOR_PATH is None:
__all__ = [ __all__ = [
'ROOT_DIR', 'ROOT_DIR',
'SHARE_DIR',
'CONFIG_DIR', 'CONFIG_DIR',
'CACHE_DIR', 'CACHE_DIR',
'SOCK_DIR', 'SOCK_DIR',

3
setup.py
View file

@ -215,6 +215,7 @@ class GenerateSaltSyspaths(Command):
INSTALL_SYSPATHS_TEMPLATE.format( INSTALL_SYSPATHS_TEMPLATE.format(
date=DATE, date=DATE,
root_dir=self.distribution.salt_root_dir, root_dir=self.distribution.salt_root_dir,
share_dir=self.distribution.salt_share_dir,
config_dir=self.distribution.salt_config_dir, config_dir=self.distribution.salt_config_dir,
cache_dir=self.distribution.salt_cache_dir, cache_dir=self.distribution.salt_cache_dir,
sock_dir=self.distribution.salt_sock_dir, sock_dir=self.distribution.salt_sock_dir,
@ -703,6 +704,7 @@ INSTALL_SYSPATHS_TEMPLATE = '''\
{date:%A, %d %B %Y @ %H:%m:%S UTC}. {date:%A, %d %B %Y @ %H:%m:%S UTC}.
ROOT_DIR = {root_dir!r} ROOT_DIR = {root_dir!r}
SHARE_DIR = {share_dir!r}
CONFIG_DIR = {config_dir!r} CONFIG_DIR = {config_dir!r}
CACHE_DIR = {cache_dir!r} CACHE_DIR = {cache_dir!r}
SOCK_DIR = {sock_dir!r} SOCK_DIR = {sock_dir!r}
@ -864,6 +866,7 @@ class SaltDistribution(distutils.dist.Distribution):
# Salt Paths Configuration Settings # Salt Paths Configuration Settings
self.salt_root_dir = None self.salt_root_dir = None
self.salt_share_dir = None
self.salt_config_dir = None self.salt_config_dir = None
self.salt_cache_dir = None self.salt_cache_dir = None
self.salt_sock_dir = None self.salt_sock_dir = None