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

Merge pull request #30384 from isbm/isbm-zypper-info-avaiable-fix

Browse Source 
Bugfix: info_available does not work correctly on SLE 11 series
This commit is contained in:
Mike Place 2016-01-15 11:31:57 -07:00
commit c478148b60
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/zypper.py
View File

@ -164,12 +164,14 @@ def info_available(*names, **kwargs):
# Run in batches # Run in batches
while batch: while batch:
cmd = 'zypper info -t package {0}'.format(' '.join(batch[:batch_size])) cmd = 'zypper info -t package {0}'.format(' '.join(batch[:batch_size]))
pkg_info.extend(re.split(r"----*", __salt__['cmd.run_stdout'](cmd, output_loglevel='trace'))) pkg_info.extend(re.split(r"Information for package*", __salt__['cmd.run_stdout'](cmd, output_loglevel='trace')))
batch = batch[batch_size:] batch = batch[batch_size:]
for pkg_data in pkg_info: for pkg_data in pkg_info:
nfo = {} nfo = {}
for line in [data for data in pkg_data.split("\n") if ":" in data]: for line in [data for data in pkg_data.split("\n") if ":" in data]:
if line.startswith("-----"):
continue
kw = [data.strip() for data in line.split(":", 1)] kw = [data.strip() for data in line.split(":", 1)]
if len(kw) == 2 and kw[1]: if len(kw) == 2 and kw[1]:
nfo[kw[0].lower()] = kw[1] nfo[kw[0].lower()] = kw[1]