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

Add msiexec to remove

Browse Source
This commit is contained in:
David Boucha 2013-02-14 17:29:08 -07:00
parent 7935df0b77
commit ad0cd13752
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/win_pkg.py
View File

@ -376,7 +376,7 @@ def upgrade(refresh=True):
return {} return {}
def remove(name, version=None, **kwargs): def remove(name, version=None, msiexec=False, **kwargs):
''' '''
Remove a single package Remove a single package
@ -404,6 +404,8 @@ def remove(name, version=None, **kwargs):
cached_pkg = cached_pkg.replace('(x86)', '') cached_pkg = cached_pkg.replace('(x86)', '')
cmd = '"' + str(os.path.expandvars( cmd = '"' + str(os.path.expandvars(
cached_pkg)) + '"' + str(pkginfo[version]['uninstall_flags']) cached_pkg)) + '"' + str(pkginfo[version]['uninstall_flags'])
if msiexec:
cmd = 'msiexec /x ' + cmd
stderr = __salt__['cmd.run_all'](cmd).get('stderr', '') stderr = __salt__['cmd.run_all'](cmd).get('stderr', '')
if stderr: if stderr:
log.error(stderr) log.error(stderr)
@ -411,7 +413,7 @@ def remove(name, version=None, **kwargs):
return __salt__['pkg_resource.find_changes'](old, new) return __salt__['pkg_resource.find_changes'](old, new)
def purge(name, **kwargs): def purge(name, version=None, msiexec=False, **kwargs):
''' '''
Recursively remove a package and all dependencies which were installed Recursively remove a package and all dependencies which were installed
with it with it
@ -422,7 +424,7 @@ def purge(name, **kwargs):
salt '*' pkg.purge <package name> salt '*' pkg.purge <package name>
''' '''
return remove(name) return remove(name, version=None, msiexec=False, **kwargs)
def _get_package_info(name): def _get_package_info(name):