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

clear available pkgs cache when pkg db changes

Browse Source 
Since repositories can be added in packages (indeed, this is the method
by which EPEL is recommended to be installed), this commit clears the
__context__ variable in which this information is stored, forcing it to
be recreated on the next call to check_db()
This commit is contained in:
Erik Johnson 2014-03-06 19:13:51 -06:00
parent fc0b4b7564
commit 4b4fb3fb52
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
salt/modules/yumpkg.py
View File

@ -389,8 +389,8 @@ def check_db(*names, **kwargs):
repo_arg = _get_repo_options(**kwargs)
repoquery_base = '{0} --all --quiet --whatprovides'.format(repo_arg)
if 'avail' in __context__:
avail = __context__['avail']
if 'pkg._avail' in __context__:
avail = __context__['pkg._avail']
else:
# get list of available packages
avail = []
@ -407,7 +407,7 @@ def check_db(*names, **kwargs):
avail.append('.'.join((name, arch)))
else:
avail.append(name)
__context__['avail'] = avail
__context__['pkg._avail'] = avail
ret = {}
for name in names:
@ -717,7 +717,10 @@ def install(name=None,
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
return salt.utils.compare_dicts(old, new)
ret = salt.utils.compare_dicts(old, new)
if ret:
__context__.pop('pkg._avail', None)
return ret
def upgrade(refresh=True):
@ -742,7 +745,10 @@ def upgrade(refresh=True):
__salt__['cmd.run'](cmd, output_loglevel='debug')
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
return salt.utils.compare_dicts(old, new)
ret = salt.utils.compare_dicts(old, new)
if ret:
__context__.pop('pkg._avail', None)
return ret
def remove(name=None, pkgs=None, **kwargs):
@ -785,7 +791,10 @@ def remove(name=None, pkgs=None, **kwargs):
__salt__['cmd.run'](cmd, output_loglevel='debug')
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
return salt.utils.compare_dicts(old, new)
ret = salt.utils.compare_dicts(old, new)
if ret:
__context__.pop('pkg._avail', None)
return ret
def purge(name=None, pkgs=None, **kwargs):