Skip to content

Commit

Permalink
Merge pull request #30384 from isbm/isbm-zypper-info-avaiable-fix
Browse files Browse the repository at this point in the history
Bugfix: info_available does not work correctly on SLE 11 series
  • Loading branch information
Mike Place committed Jan 15, 2016
2 parents 9fe2df8 + c7bc20e commit c478148
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion salt/modules/zypper.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,14 @@ def info_available(*names, **kwargs):
# Run in batches
while batch:
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:]

for pkg_data in pkg_info:
nfo = {}
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)]
if len(kw) == 2 and kw[1]:
nfo[kw[0].lower()] = kw[1]
Expand Down

0 comments on commit c478148

Please sign in to comment.