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

Throw an error when the time comes to remove the deprecated code.

Browse source
This commit is contained in:
Pedro Algarvio 2015-01-09 16:53:36 +00:00
parent 8a6e0a38ed
commit 3f14678796
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
setup.py
View file

@ -409,7 +409,6 @@ class Build(build):
class Install(install):
# XXX: Remove the Salt Specific Options In Salt Boron. They are now global options
user_options = install.user_options + [
('salt-root-dir=', None,
'Salt\'s pre-configured root directory'),
@ -435,6 +434,14 @@ class Install(install):
def initialize_options(self):
install.initialize_options(self)
# pylint: disable=undefined-variable
if __saltstack_version__.info >= (2015, 3):
# XXX: Remove the Salt Specific Options In Salt Boron. They are now global options
raise DistutilsArgError(
'Developers, please remove the salt paths configuration '
'setting from the setup\'s install command'
)
# pylint: enable=undefined-variable
self.salt_root_dir = None
self.salt_config_dir = None
self.salt_cache_dir = None