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

Deprecate old winrepo config params in salt.states.winrepo

Browse Source
This commit is contained in:
Erik Johnson 2015-08-09 02:50:06 -05:00
parent 692d96e9d2
commit bc0832cd12
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
salt/states/winrepo.py
View File

@ -16,6 +16,7 @@ import itertools
# Salt Modules
import salt.runner
import salt.utils
import salt.config
@ -57,28 +58,50 @@ def genrepo(name, force=False, allow_empty=False):
'changes': {},
'comment': ''}
master_config = salt.config.master_config(os.path.join(salt.syspaths.CONFIG_DIR, 'master'))
win_repo = master_config['win_repo']
win_repo_mastercachefile = master_config['win_repo_mastercachefile']
if 'win_repo' in __opts__:
salt.utils.warn_until(
'Nitrogen',
'The \'win_repo\' config option is deprecated, please use '
'\'winrepo_dir\' instead.'
)
winrepo_dir = __opts__['win_repo']
else:
winrepo_dir = __opts__['winrepo_dir']
# Check if the win_repo directory exists
# if not search for a file with a newer mtime than the win_repo_mastercachefile file
if 'win_repo_mastercachefile' in __opts__:
salt.utils.warn_until(
'Nitrogen',
'The \'win_repo_mastercachefile\' config option is deprecated, '
'please use \'winrepo_cachefile\' instead.'
)
winrepo_cachefile = __opts__['win_repo_mastercachefile']
else:
winrepo_cachefile = __opts__['winrepo_cachefile']
# We're actually looking for the full path to the cachefile here, so
# prepend the winrepo_dir
winrepo_cachefile = os.path.join(winrepo_dir, winrepo_cachefile)
master_config = salt.config.master_config(os.path.join(salt.syspaths.CONFIG_DIR, 'master'))
# Check if the winrepo directory exists
# if not search for a file with a newer mtime than the winrepo_cachefile file
execute = False
if not force:
if not os.path.exists(win_repo):
if not os.path.exists(winrepo_dir):
ret['result'] = False
ret['comment'] = 'missing {0}'.format(win_repo)
ret['comment'] = '{0} is missing'.format(winrepo_dir)
return ret
elif not os.path.exists(win_repo_mastercachefile):
elif not os.path.exists(winrepo_cachefile):
execute = True
ret['comment'] = 'missing {0}'.format(win_repo_mastercachefile)
ret['comment'] = '{0} is missing'.format(winrepo_cachefile)
else:
win_repo_mastercachefile_mtime = os.stat(win_repo_mastercachefile)[stat.ST_MTIME]
for root, dirs, files in os.walk(win_repo):
winrepo_cachefile_mtime = os.stat(winrepo_cachefile)[stat.ST_MTIME]
for root, dirs, files in os.walk(winrepo_dir):
for name in itertools.chain(files, dirs):
full_path = os.path.join(root, name)
if os.stat(full_path)[stat.ST_MTIME] > win_repo_mastercachefile_mtime:
ret['comment'] = 'mtime({0}) < mtime({1})'.format(win_repo_mastercachefile, full_path)
if os.stat(full_path)[stat.ST_MTIME] > winrepo_cachefile_mtime:
ret['comment'] = 'mtime({0}) < mtime({1})'.format(winrepo_cachefile, full_path)
execute = True
break
@ -93,7 +116,7 @@ def genrepo(name, force=False, allow_empty=False):
runner_ret = runner.cmd('winrepo.genrepo', [])
ret['changes'] = {'winrepo': runner_ret}
if isinstance(runner_ret, dict) and runner_ret == {} and not allow_empty:
os.remove(win_repo_mastercachefile)
os.remove(winrepo_cachefile)
ret['result'] = False
ret['comment'] = 'winrepo.genrepo returned empty'
return ret