saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30850 from jfindlay/dpkg_var

Browse source 
modules.dpkg._get_pkg_info: allow for ubuntu 12.04
This commit is contained in:
Mike Place 2016-02-03 09:33:26 -07:00
commit 8410842aea
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/dpkg.py
View file

@ -254,8 +254,13 @@ def _get_pkg_info(*packages):
:return:
'''
ret = list()
cmd = "dpkg-query -W -f='package:${binary:Package}\\n" \
if __grains__['os'] == 'Ubuntu' and __grains__['osrelease_info'] <= (12, 4):
bin_var = '${binary}'
else:
bin_var = '${binary:Package}'
ret = []
cmd = "dpkg-query -W -f='package:" + bin_var + "\\n" \
"revision:${binary:Revision}\\n" \
"architecture:${Architecture}\\n" \
"maintainer:${Maintainer}\\n" \
@ -281,7 +286,7 @@ def _get_pkg_info(*packages):
raise CommandExecutionError("Error getting packages information: {0}".format(call['stderr']))
for pkg_info in [elm for elm in re.split(r"----*", call['stdout']) if elm.strip()]:
pkg_data = dict()
pkg_data = {}
pkg_info, pkg_descr = re.split(r"====*", pkg_info)
for pkg_info_line in [el.strip() for el in pkg_info.split(os.linesep) if el.strip()]:
key, value = pkg_info_line.split(":", 1)