valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9557 from hulu/copyedit-zcbuildout

Browse Source 
copyedit zcbuildout module
This commit is contained in:
Pedro Algarvio 2014-01-02 17:05:55 -08:00
commit 626cfa9456
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/zcbuildout.py
View File

@ -295,8 +295,8 @@ def _has_setuptools7(python=sys.executable, runas=None, env=()):
def _find_cfgs(path, cfgs=None): def _find_cfgs(path, cfgs=None):
''' '''
Find all buildout configs in a sudirectory. Find all buildout configs in a subdirectory.
only builout.cfg and etc/buildout.cfg are valid in:: only buildout.cfg and etc/buildout.cfg are valid in::
path path
directory where to start to search directory where to start to search
@ -386,7 +386,7 @@ def _get_buildout_ver(directory='.'):
def _get_bootstrap_url(directory): def _get_bootstrap_url(directory):
''' '''
Get the most appropriate download url for the bootstrap script. Get the most appropriate download URL for the bootstrap script.
directory directory
directory to execute in directory to execute in
@ -419,7 +419,7 @@ def upgrade_bootstrap(directory='.',
Upgrade current bootstrap.py with the last released one. Upgrade current bootstrap.py with the last released one.
Indeed, when we first run a buildout, a common source of problem Indeed, when we first run a buildout, a common source of problem
is to have an locally stale boostrap, we just try rab a new copy is to have a locally stale bootstrap, we just try to grab a new copy
directory directory
directory to execute in directory to execute in
@ -448,7 +448,7 @@ def upgrade_bootstrap(directory='.',
buildout_ver = _get_buildout_ver(directory) buildout_ver = _get_buildout_ver(directory)
booturl = _get_bootstrap_url(directory) booturl = _get_bootstrap_url(directory)
LOG.debug('Using %s' % booturl) LOG.debug('Using %s' % booturl)
# try to donwload an uptodate bootstrap # try to download an up-to-date bootstrap
# set defaulttimeout # set defaulttimeout
# and add possible content # and add possible content
directory = os.path.abspath(directory) directory = os.path.abspath(directory)