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

fix issues in module sync

Browse Source
This commit is contained in:
Thomas S Hatch 2012-01-04 22:04:56 -07:00
parent 24021f19c9
commit 2fe9e3b58e
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/saltutil.py
View File

@ -4,6 +4,8 @@ used to manage minion modules as well as automate updates to the salt minion
'''
import os
import hashlib
import shutil
import logging
log = logging.getLogger(__name__)
@ -13,12 +15,10 @@ def _sync(form, env):
Sync the given directory in the given environment
'''
ret = []
source = os.path.join('salt://{0}'.format(env), '_{0}'.format(form))
mod_dir = os.path.join(__opts__['extention_modules'], '{0}'.format(form))
source = os.path.join('salt://_{0}'.format(form))
mod_dir = os.path.join(__opts__['extension_modules'], '{0}'.format(form))
if not os.path.isdir(mod_dir):
# Specified a non existing module type
log.error('Failed to sync modules for {0}'.format(directory))
return ret
os.makedirs(mod_dir)
for fn_ in __salt__['cp.cache_dir'](source, env):
dest = os.path.join(mod_dir,
os.path.basename(fn_)