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

Fix some missing variables and imports.

Browse source
This commit is contained in:
Pedro Algarvio 2013-11-14 18:18:51 +00:00
parent d34439d616
commit 8c14e211b7
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
setup.py
View file

@ -10,7 +10,9 @@ from __future__ import with_statement
import os import os
import sys import sys
import glob import glob
import urllib2
from datetime import datetime from datetime import datetime
from distutils import log
from distutils.cmd import Command from distutils.cmd import Command
from distutils.command.build import build from distutils.command.build import build
from distutils.command.clean import clean from distutils.command.clean import clean
@ -27,6 +29,15 @@ except NameError:
if SETUP_DIRNAME != '': if SETUP_DIRNAME != '':
os.chdir(SETUP_DIRNAME) os.chdir(SETUP_DIRNAME)
BOOTSTRAP_SCRIPT_DISTRIBUTED_VERSION = os.environ.get(
# The user can provide a different bootstrap-script version.
# ATTENTION: A tag for that version MUST exist
'BOOTSTRAP_SCRIPT_VERSION',
# If no bootstrap-script version was provided from the environment, let's
# provide the one we define.
'v1.5.9'
)
# Store a reference to the executing platform # Store a reference to the executing platform
IS_WINDOWS_PLATFORM = sys.platform.startswith('win') IS_WINDOWS_PLATFORM = sys.platform.startswith('win')
@ -83,13 +94,13 @@ exec(compile(open(SALT_SYSPATHS).read(), SALT_SYSPATHS, 'exec'))
class CloudSdist(sdist): class CloudSdist(sdist):
user_options = original_sdist.user_options + [ user_options = sdist.user_options + [
('skip-bootstrap-download', None, ('skip-bootstrap-download', None,
'Skip downloading the bootstrap-salt.sh script. This can also be ' 'Skip downloading the bootstrap-salt.sh script. This can also be '
'triggered by having `SKIP_BOOTSTRAP_DOWNLOAD=1` as an environment ' 'triggered by having `SKIP_BOOTSTRAP_DOWNLOAD=1` as an environment '
'variable.') 'variable.')
] ]
boolean_options = original_sdist.boolean_options + [ boolean_options = sdist.boolean_options + [
'skip-bootstrap-download' 'skip-bootstrap-download'
] ]
@ -117,8 +128,9 @@ class CloudSdist(sdist):
) )
req = urllib2.urlopen(url) req = urllib2.urlopen(url)
deploy_path = os.path.join( deploy_path = os.path.join(
SALTCLOUD_SOURCE_DIR, SETUP_DIRNAME,
'saltcloud', 'salt',
'cloud',
'deploy', 'deploy',
'bootstrap-salt.sh' 'bootstrap-salt.sh'
) )