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

Merge pull request #39415 from bbinet/gen_thin-absonly

Browse Source 
Restore support to generate thin tarballs with local packages
This commit is contained in:
Mike Place 2017-03-03 09:18:44 -07:00 committed by GitHub
commit be48790927
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/runners/thin.py
View File

@ -16,7 +16,7 @@ import salt.utils.thin
def generate(extra_mods='', overwrite=False, so_mods='',
python2_bin='python2', python3_bin='python3'):
python2_bin='python2', python3_bin='python3', absonly=True):
'''
Generate the salt-thin tarball and print the location of the tarball
Optional additional mods to include (e.g. mako) can be supplied as a comma
@ -40,7 +40,8 @@ def generate(extra_mods='', overwrite=False, so_mods='',
overwrite,
so_mods,
python2_bin,
python3_bin)
python3_bin,
absonly)
def generate_min(extra_mods='', overwrite=False, so_mods='',

4
salt/utils/thin.py
View File

@ -154,7 +154,7 @@ def get_tops(extra_mods='', so_mods=''):
def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
python2_bin='python2', python3_bin='python3'):
python2_bin='python2', python3_bin='python3', absonly=True):
'''
Generate the salt-thin tarball and print the location of the tarball
Optional additional mods to include (e.g. mako) can be supplied as a comma
@ -269,7 +269,7 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
tempdir = None
for py_ver, tops in _six.iteritems(tops_py_version_mapping):
for top in tops:
if not os.path.isabs(top):
if absonly and not os.path.isabs(top):
continue
base = os.path.basename(top)
top_dirname = os.path.dirname(top)