mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Merge branch 'develop' of git://github.com/saltstack/salt into develop
This commit is contained in:
commit
ef523b02f0
14
setup.py
14
setup.py
@ -14,12 +14,16 @@ from distutils.sysconfig import get_python_lib, PREFIX
|
||||
# Use setuptools if available, else fallback to distutils.
|
||||
# As an example, setuptools is available in virtualenvs and buildouts through
|
||||
# Setuptools or Distribute.
|
||||
try:
|
||||
from setuptools import setup
|
||||
with_setuptools = True
|
||||
except ImportError:
|
||||
with_setuptools = False
|
||||
if 'SETUPTOOLS' in os.environ:
|
||||
try:
|
||||
from setuptools import setup
|
||||
with_setuptools = True
|
||||
except:
|
||||
with_setuptools = False
|
||||
|
||||
if with_setuptools == False:
|
||||
from distutils.core import setup
|
||||
with_setuptools = False
|
||||
|
||||
|
||||
exec(compile(open("salt/version.py").read(), "salt/version.py", 'exec'))
|
||||
|
Loading…
Reference in New Issue
Block a user