commit 69871cf67c946591523d9e09bca1be195c8c675b
author Jakub Josef <jakub.josef@gmail.com> Thu May 18 14:46:04 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu May 18 14:46:05 2017 +0000
tree ba08f23f163ad0f993669719d368dcad14302d49
parent 1cd53c9b300b459ecfe901b3807622fc4e996725
parent 8fd829465463770d85d2697ed44cb65f83da8557

Merge "Fixed SMTP settigns enforcing"

_states/jenkins_smtp.py

diff --git a/_states/jenkins_smtp.py b/_states/jenkins_smtp.py
index 98bbd6d..969019c 100644
--- a/_states/jenkins_smtp.py
+++ b/_states/jenkins_smtp.py
@@ -5,7 +5,8 @@
 def result = ""
 for(desc in [Jenkins.getInstance().getDescriptor("hudson.plugins.emailext.ExtendedEmailPublisher"),Jenkins.getInstance().getDescriptor("hudson.tasks.Mailer")]){{
     if(desc.getSmtpServer().equals("{host}") &&
-       desc.getSmtpAuthUsername().equals("{username}") &&
+       ((desc instanceof hudson.plugins.emailext.ExtendedEmailPublisherDescriptor && desc.getSmtpAuthUsername().equals("{username}")) ||
+        (desc instanceof hudson.tasks.Mailer$DescriptorImpl && desc.getSmtpAuthUserName().equals("{username}"))) &&
        desc.getSmtpAuthPassword().toString().equals("{password}") &&
        desc.getSmtpPort().equals("{port}") &&
        desc.getUseSsl() == {ssl} &&