From e605d071f15062bbbd7eb7e6a3546a6e1905e9dc Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 10 Feb 2010 16:11:47 +0000 Subject: [PATCH] [FIXED HUDSON-1375] Maven modules should not be buildable when the parent project is disabled git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@27254 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/AbstractProject.java | 6 +++--- .../resources/hudson/model/AbstractProject/sidepanel.jelly | 4 ++-- maven-plugin/src/main/java/hudson/maven/MavenModule.java | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 21510af8f8..3757fffb46 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -425,7 +425,7 @@ public abstract class AbstractProject

,R extends A return scmCheckoutRetryCount != null; } - public final boolean isBuildable() { + public boolean isBuildable() { return !isDisabled(); } @@ -661,7 +661,7 @@ public abstract class AbstractProject

,R extends A * For the convenience of the caller, this array can contain null, and those will be silently ignored. */ public Future scheduleBuild2(int quietPeriod, Cause c, Action... actions) { - if (isDisabled()) + if (!isBuildable()) return null; List queueActions = new ArrayList(Arrays.asList(actions)); @@ -1388,7 +1388,7 @@ public abstract class AbstractProject

,R extends A String delay = req.getParameter("delay"); if (delay!=null) { - if (!isDisabled()) { + if (isBuildable()) { try { // TODO: more unit handling if(delay.endsWith("sec")) delay=delay.substring(0,delay.length()-3); diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly index 4cf0be80c6..5a463052ad 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly @@ -41,7 +41,7 @@ THE SOFTWARE. - +