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

Merge pull request #10183 from tedski/10107_fix

Browse Source 
Check for missing deps before attempting to install.
This commit is contained in:
Thomas S Hatch 2014-02-04 19:41:51 -08:00
commit ea4bc80549
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
salt/modules/apt_pkg.py → salt/modules/aptpkg.py
View File

@ -1556,25 +1556,26 @@ def _resolve_deps(name, pkgs, **kwargs):
deb = apt.debfile.DebPackage(filename=pkg_file)
if deb.check():
missing_deps.extend(deb.missing_deps)
cmd = ['apt-get', '-q', '-y']
cmd = cmd + ['-o', 'DPkg::Options::=--force-confold']
cmd = cmd + ['-o', 'DPkg::Options::=--force-confdef']
cmd.append('install')
cmd.extend(missing_deps)
ret = __salt__['cmd.run'](cmd, env=kwargs.get('env'), python_shell=False,
output_loglevel='debug')
if missing_deps:
cmd = ['apt-get', '-q', '-y']
cmd = cmd + ['-o', 'DPkg::Options::=--force-confold']
cmd = cmd + ['-o', 'DPkg::Options::=--force-confdef']
cmd.append('install')
cmd.extend(missing_deps)
if ret['retcode'] != 0:
raise CommandExecutionError(
'Error: unable to resolve dependencies for: {0}'.format(name)
)
else:
try:
cmd = ['apt-mark', 'auto'] + missing_deps
__salt__['cmd.run'](cmd, env=kwargs.get('env'), python_shell=False,
output_loglevel='debug')
except MinionError as exc:
raise CommandExecutionError(exc)
ret = __salt__['cmd.retcode'](cmd, env=kwargs.get('env'), python_shell=False,
output_loglevel='debug')
if ret != 0:
raise CommandExecutionError(
'Error: unable to resolve dependencies for: {0}'.format(name)
)
else:
try:
cmd = ['apt-mark', 'auto'] + missing_deps
__salt__['cmd.run'](cmd, env=kwargs.get('env'), python_shell=False,
output_loglevel='debug')
except MinionError as exc:
raise CommandExecutionError(exc)
return