From c70df4adcd4974362163102f1c675defb03b3a36 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 14 Sep 2017 16:18:45 -0700 Subject: [PATCH 1/3] Following the change in #42103 if Salt is installed via setup.py then the generated _syspaths.py does not contain the HOME_DIR which results in a failure. --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index effdc2f230..53892807c3 100755 --- a/setup.py +++ b/setup.py @@ -234,6 +234,7 @@ class GenerateSaltSyspaths(Command): spm_formula_path=self.distribution.salt_spm_formula_dir, spm_pillar_path=self.distribution.salt_spm_pillar_dir, spm_reactor_path=self.distribution.salt_spm_reactor_dir, + home_dir=self.distribution.salt_home_dir, ) ) @@ -724,6 +725,7 @@ PIDFILE_DIR = {pidfile_dir!r} SPM_FORMULA_PATH = {spm_formula_path!r} SPM_PILLAR_PATH = {spm_pillar_path!r} SPM_REACTOR_PATH = {spm_reactor_path!r} +HOME_DIR = {home_dir!r} ''' @@ -892,6 +894,7 @@ class SaltDistribution(distutils.dist.Distribution): self.salt_spm_formula_dir = None self.salt_spm_pillar_dir = None self.salt_spm_reactor_dir = None + self.salt_home_dir = None self.name = 'salt-ssh' if PACKAGED_FOR_SALT_SSH else 'salt' self.salt_version = __version__ # pylint: disable=undefined-variable From fadcc61618fa1b579ac76bd8f41cb34c442f2ac7 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 14 Sep 2017 18:34:32 -0700 Subject: [PATCH 2/3] Adding home_dir to SaltDistribution.global_options. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 53892807c3..bcdd058d69 100755 --- a/setup.py +++ b/setup.py @@ -868,8 +868,8 @@ class SaltDistribution(distutils.dist.Distribution): 'Salt\'s pre-configured SPM formulas directory'), ('salt-spm-pillar-dir=', None, 'Salt\'s pre-configured SPM pillar directory'), - ('salt-spm-reactor-dir=', None, - 'Salt\'s pre-configured SPM reactor directory'), + ('salt-home-dir=', None, + 'Salt\'s pre-configured user home directory'), ] def __init__(self, attrs=None): From 2cdd775ca8bcc00d7b8e1d9bcaac104e1457c131 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 15 Sep 2017 08:40:38 -0700 Subject: [PATCH 3/3] Adding back in the salt-spm-reactor-dir --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index bcdd058d69..aacebb95a1 100755 --- a/setup.py +++ b/setup.py @@ -868,6 +868,8 @@ class SaltDistribution(distutils.dist.Distribution): 'Salt\'s pre-configured SPM formulas directory'), ('salt-spm-pillar-dir=', None, 'Salt\'s pre-configured SPM pillar directory'), + ('salt-spm-reactor-dir=', None, + 'Salt\'s pre-configured SPM reactor directory'), ('salt-home-dir=', None, 'Salt\'s pre-configured user home directory'), ]