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

check for msiexec in correct location

Browse Source
This commit is contained in:
David Boucha 2013-02-14 19:02:42 -07:00
parent b038b66865
commit db40c6a241
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/win_pkg.py
View File

@ -310,7 +310,7 @@ def refresh_db():
return True return True
def install(name=None, refresh=False, msiexec=False, **kwargs): def install(name=None, refresh=False, **kwargs):
''' '''
Install the passed package Install the passed package
@ -344,7 +344,7 @@ def install(name=None, refresh=False, msiexec=False, **kwargs):
cached_pkg = pkginfo[version]['installer'] cached_pkg = pkginfo[version]['installer']
cached_pkg = cached_pkg.replace('/', '\\') cached_pkg = cached_pkg.replace('/', '\\')
cmd = '"' + str(cached_pkg) + '"' + str(pkginfo[version]['install_flags']) cmd = '"' + str(cached_pkg) + '"' + str(pkginfo[version]['install_flags'])
if msiexec: if pkginfo[msiexec]:
cmd = 'msiexec /i ' + cmd cmd = 'msiexec /i ' + cmd
stderr = __salt__['cmd.run_all'](cmd).get('stderr', '') stderr = __salt__['cmd.run_all'](cmd).get('stderr', '')
if stderr: if stderr: