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

BUGFIX: pass env the right way, because when use os.env way, LC_ALL will

Browse Source 
always be overrided in modules/cmdmod.py
This commit is contained in:
hvnsweeting 2013-11-09 00:31:28 +07:00
parent 4c6063cc78
commit a23e9c7b5c
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/modules/apt.py
View File

@ -380,12 +380,6 @@ def install(name=None,
if not fromrepo and repo: if not fromrepo and repo:
fromrepo = repo fromrepo = repo
if kwargs.get('env'):
try:
os.environ.update(kwargs.get('env'))
except Exception as e:
log.exception(e)
old = list_pkgs() old = list_pkgs()
downgrade = False downgrade = False
@ -428,7 +422,7 @@ def install(name=None,
cmd.append('install') cmd.append('install')
cmd.extend(targets) cmd.extend(targets)
__salt__['cmd.run_all'](cmd, python_shell=False) __salt__['cmd.run_all'](cmd, env=kwargs.get('env'), python_shell=False)
__context__.pop('pkg.list_pkgs', None) __context__.pop('pkg.list_pkgs', None)
new = list_pkgs() new = list_pkgs()
return salt.utils.compare_dicts(old, new) return salt.utils.compare_dicts(old, new)
@ -439,11 +433,6 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs):
remove and purge do identical things but with different apt-get commands, remove and purge do identical things but with different apt-get commands,
this function performs the common logic. this function performs the common logic.
''' '''
if kwargs.get('env'):
try:
os.environ.update(kwargs.get('env'))
except Exception as e:
log.exception(e)
pkg_params = __salt__['pkg_resource.parse_targets'](name, pkgs)[0] pkg_params = __salt__['pkg_resource.parse_targets'](name, pkgs)[0]
old = list_pkgs() old = list_pkgs()
@ -455,7 +444,7 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs):
return {} return {}
cmd = ['apt-get', '-q', '-y', action] cmd = ['apt-get', '-q', '-y', action]
cmd.extend(targets) cmd.extend(targets)
__salt__['cmd.run_all'](cmd, python_shell=False) __salt__['cmd.run_all'](cmd, env=kwargs.get('env'), python_shell=False)
__context__.pop('pkg.list_pkgs', None) __context__.pop('pkg.list_pkgs', None)
new = list_pkgs() new = list_pkgs()
new_removed = list_pkgs(removed=True) new_removed = list_pkgs(removed=True)