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

Import install command from setuptools if we use them.

Browse source 
This commit fixes bug with option --single-version-externally-managed.
This commit is contained in:
Svetlana Shturm 2013-02-13 14:53:33 +04:00
parent 0d01e5a924
commit 6dac3120a8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
setup.py
View file

@ -12,7 +12,6 @@ from datetime import datetime
from distutils.cmd import Command
from distutils.command.build import build
from distutils.command.clean import clean
from distutils.command.install import install
from distutils.sysconfig import get_python_lib, PREFIX
# Change to salt source's directory prior to running any command
@ -27,12 +26,14 @@ with_setuptools = False
if 'USE_SETUPTOOLS' in os.environ:
try:
from setuptools import setup
from setuptools.command.install import install
with_setuptools = True
except:
with_setuptools = False
if with_setuptools is False:
import warnings
from distutils.command.install import install
from distutils.core import setup
warnings.filterwarnings(
'ignore',