From 3d6828949e5902d8fa0a39985f451e17211a60dc Mon Sep 17 00:00:00 2001 From: Benoit Dunand-Laisin Date: Thu, 24 May 2018 04:15:47 +0200 Subject: [PATCH] Fixes #24241 Module always updates installed plugins (#40591) * Update jenkins_plugin.py When setting state=latest, plugin are always updated because plugin_data['sha1'] contains trailing '\r\n' (so it always detecting a sha1 change) +label: docsite_pr * rstrip wasn't the solution but to_bytes is --- lib/ansible/modules/web_infrastructure/jenkins_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/web_infrastructure/jenkins_plugin.py b/lib/ansible/modules/web_infrastructure/jenkins_plugin.py index 333fad9463c..5d365d14d64 100644 --- a/lib/ansible/modules/web_infrastructure/jenkins_plugin.py +++ b/lib/ansible/modules/web_infrastructure/jenkins_plugin.py @@ -261,7 +261,7 @@ state: sample: "present" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, to_bytes from ansible.module_utils.six.moves.urllib.parse import urlencode from ansible.module_utils.urls import fetch_url, url_argument_spec from ansible.module_utils._text import to_native @@ -491,7 +491,7 @@ class JenkinsPlugin(object): sha1sum_old = base64.b64encode(sha1_old.digest()) # If the latest version changed, download it - if sha1sum_old != plugin_data['sha1']: + if sha1sum_old != to_bytes(plugin_data['sha1']): if not self.module.check_mode: r = self._download_plugin(plugin_url) self._write_file(plugin_file, r)