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

Merge pull request #10426 from plastikos/issue-10425

Browse Source 
Include msgpack in thin.tgz
This commit is contained in:
Thomas S Hatch 2014-02-14 13:05:56 -07:00
commit 7cc71ff1d5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/thin.py
View File

@ -10,6 +10,7 @@ import tarfile
# Import third party libs # Import third party libs
import jinja2 import jinja2
import yaml import yaml
import msgpack
try: try:
import markupsafe import markupsafe
HAS_MARKUPSAFE = True HAS_MARKUPSAFE = True
@ -60,6 +61,7 @@ def gen_thin(cachedir, extra_mods='', overwrite=False):
os.path.dirname(salt.__file__), os.path.dirname(salt.__file__),
os.path.dirname(jinja2.__file__), os.path.dirname(jinja2.__file__),
os.path.dirname(yaml.__file__), os.path.dirname(yaml.__file__),
os.path.dirname(msgpack.__file__),
] ]
for mod in [m for m in extra_mods.split(',') if m]: for mod in [m for m in extra_mods.split(',') if m]:
if mod not in locals() and mod not in globals(): if mod not in locals() and mod not in globals():