cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't split line when no version available for plugin (#37907)

Browse source 
* Don't split line when no version available for plugin

* Fixed author github account
This commit is contained in:
Seuf 2018-05-03 17:10:18 +02:00 committed by Brian Coca
parent 0c0dc8d9fc
commit cc477ba8cc
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/monitoring/grafana_plugin.py
View file

@ -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
@ -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}