Merge pull request #25093 from jaybocc2/2014.7

quick fix for issue #18447
This commit is contained in:
Mike Place 2015-07-01 09:56:53 -06:00
commit 36d53ef59e

View file

@ -406,6 +406,8 @@ class Build(build):
class Install(install):
user_options = install.user_options + [
('salt-transport=', None, 'The transport to prepare salt for. Choices are \'zeromq\' '
'\'raet\' or \'both\'. Defaults to \'zeromq\'', 'zeromq'),
('salt-root-dir=', None,
'Salt\'s pre-configured root directory'),
('salt-config-dir=', None,
@ -442,6 +444,7 @@ class Install(install):
self.salt_logs_dir = LOGS_DIR
self.salt_pidfile_dir = PIDFILE_DIR
# pylint: enable=undefined-variable
self.salt_transport = None
def finalize_options(self):
install.finalize_options(self)