[JENKINS-19081] @kohsuke prefers that the option to disable signature…

… checks not even be presented unless -Dhudson.model.DownloadService.noSignatureCheck is used. (cherry picked from commit 54c8500)
jenkinsci · Apr 13, 2014 · 7d6e02e · 7d6e02e
1 parent 09af03a
commit 7d6e02e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
@@ -346,7 +346,7 @@ public static Downloadable get(String id) {
 
     public static boolean neverUpdate = Boolean.getBoolean(DownloadService.class.getName()+".never");
 
-    /** @deprecated Use {@link DownloadSettings#setIgnoreSignature} instead. */
+    /** Now used only to set default value of, and enable UI switching of, {@link DownloadSettings#setIgnoreSignature}. */
     public static boolean signatureCheck = !Boolean.getBoolean(DownloadService.class.getName()+".noSignatureCheck");
 }
 
diff --git a/core/src/main/resources/jenkins/security/DownloadSettings/config.groovy b/core/src/main/resources/jenkins/security/DownloadSettings/config.groovy
@@ -6,7 +6,9 @@ f.section(title: _("Download Preferences")) {
     f.entry(title: _("Use Browser"), field: "useBrowser") {
         f.checkbox()
     }
-    f.entry(title: _("Check Signatures"), field: "checkSignature") {
-        f.checkbox()
+    if (!instance.checkSignature || !hudson.model.DownloadService.signatureCheck) { // do not display this option by default
+        f.entry(title: _("Check Signatures"), field: "checkSignature") {
+            f.checkbox()
+        }
     }
 }