saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-15 09:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Work around __file__ NameError thrown by bbfreeze. Fixes #5172.

Browse source
This commit is contained in:
Pedro Algarvio 2013-05-22 02:00:44 +01:00
parent 0aeb2af20f
commit 6996afaf46
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/version.py
View file

@ -34,11 +34,21 @@ def __get_version(version, version_info):
import warnings
import subprocess
try:
cwd = os.path.abspath(os.path.dirname(__file__))
except NameError:
# We're most likely being frozen and __file__ triggered this NameError
# Let's work around that
import inspect
cwd = os.path.abspath(
os.path.dirname(inspect.getsourcefile(__get_version))
)
try:
kwargs = dict(
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
cwd=os.path.abspath(os.path.dirname(__file__))
cwd=cwd
)
if not sys.platform.startswith('win'):

18
setup.py
View file

@ -15,7 +15,13 @@ from distutils.command.clean import clean
from distutils.sysconfig import get_python_lib, PREFIX
# Change to salt source's directory prior to running any command
setup_dirname = os.path.dirname(__file__)
try:
setup_dirname = os.path.dirname(__file__)
except NameError:
# We're most likely being frozen and __file__ triggered this NameError
# Let's work around that
setup_dirname = os.path.dirname(sys.argv[0])
if setup_dirname != '':
os.chdir(setup_dirname)
@ -54,11 +60,13 @@ try:
except ImportError:
HAS_ESKY = False
salt_version = os.path.join(os.path.abspath(
os.path.dirname(__file__)), 'salt', 'version.py')
salt_version = os.path.join(
os.path.abspath(setup_dirname), 'salt', 'version.py'
)
salt_reqs = os.path.join(os.path.abspath(
os.path.dirname(__file__)), 'requirements.txt')
salt_reqs = os.path.join(
os.path.abspath(setup_dirname), 'requirements.txt'
)
exec(compile(open(salt_version).read(), salt_version, 'exec'))