Skip to content

Commit

Permalink
Don't split line when no version available for plugin (ansible#37907)
Browse files Browse the repository at this point in the history
* Don't split line when no version available for plugin

* Fixed author github account
  • Loading branch information
seuf authored and ilicmilan committed Aug 15, 2018
1 parent 4adebbc commit 573dc77
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/grafana_plugin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2017, Thierry Sallé (@tsalle)
# Copyright: (c) 2017, Thierry Sallé (@seuf)
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import absolute_import, division, print_function
Expand Down Expand Up @@ -178,7 +178,11 @@ def grafana_plugin(module, params):
stdout_lines = stdout.split("\n")
for line in stdout_lines:
if line.find(params['name']):
plugin_name, plugin_version = line.split(' @ ')
if line.find(' @ ') != -1:
line = line.rstrip()
plugin_name, plugin_version = line.split(' @ ')
else:
plugin_version = None
return {'msg': 'Grafana plugin {} installed : {}'.format(params['name'], cmd),
'changed': True,
'version': plugin_version}
Expand Down

0 comments on commit 573dc77

Please sign in to comment.