commit 0a03c2cee0c10e8890f7250332fbff16261f04b0
author Jakub Josef <jakub.josef@gmail.com> Wed Mar 22 17:35:40 2017 +0100
committer Jakub Josef <jakub.josef@gmail.com> Wed Mar 22 18:16:01 2017 +0100
tree 2b34af621e153006991d55977134b8bc35ca4779
parent 1a6627c7b27280b53bd62a3b222979fdd2fb2915

Fix script approvals from client side

Change-Id: I219d4bc058af9cf8dd66358ffc8d416e970192f1

_states/jenkins_approval.py

diff --git a/_states/jenkins_approval.py b/_states/jenkins_approval.py
index 63df775..f5263fb 100644
--- a/_states/jenkins_approval.py
+++ b/_states/jenkins_approval.py
@@ -5,16 +5,16 @@
 import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval
 import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage
 import org.jenkinsci.plugins.scriptsecurity.scripts.ApprovalContext
-def signature = "{signature}"
+def signature = '{signature}'
 def scriptApproval = ScriptApproval.get()
 def approvedSignatures = Arrays.asList(scriptApproval.approvedSignatures)
 if(approvedSignatures.contains(signature)){{
-    println("EXISTS")
+    print("EXISTS")
 }}else{{
     try{{
         scriptApproval.pendingSignatures.add(new ScriptApproval.PendingSignature(signature, false, ApprovalContext.create()))
         scriptApproval.approveSignature(signature)
-        if(approvedSignatures.contains(signature)){{
+        if(Arrays.asList(scriptApproval.approvedSignatures).contains(signature)){{
             print("SUCCESS")
         }}else{{
             print("FAILED")
@@ -29,7 +29,7 @@
 import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval
 import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage
 import org.jenkinsci.plugins.scriptsecurity.scripts.ApprovalContext
-def signature = "{signature}"
+def signature = '{signature}'
 def scriptApproval = ScriptApproval.get()
 def approvedSignatures = Arrays.asList(scriptApproval.approvedSignatures)
 if(approvedSignatures.contains(signature)){{