summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 02:18:40 (EST)
committer Winston Prakash2011-12-01 20:47:32 (EST)
commit5f09e27bbe083fad43835abb35119bfd6411aa7b (patch)
tree02828612cdb8b818b756665ea7479f5c826c2cfb
parent101a7fe4657b6462056509760f5994c51e751e71 (diff)
downloadorg.eclipse.hudson.core-5f09e27bbe083fad43835abb35119bfd6411aa7b.zip
org.eclipse.hudson.core-5f09e27bbe083fad43835abb35119bfd6411aa7b.tar.gz
org.eclipse.hudson.core-5f09e27bbe083fad43835abb35119bfd6411aa7b.tar.bz2
Resolve HUDSON-7046 (Block Build when downstream project is building - No UI for matrix build): add UI for matrix build
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/model/AbstractProject.java3
-rw-r--r--hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly1
2 files changed, 3 insertions, 1 deletions
diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index e5165c6..07ff4be 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -1349,7 +1349,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
AbstractProject<?,?> bup = getBuildingDownstream();
if (bup!=null)
return new BecauseOfDownstreamBuildInProgress(bup);
- } else if (blockBuildWhenUpstreamBuilding()) {
+ }
+ if (blockBuildWhenUpstreamBuilding()) {
AbstractProject<?,?> bup = getBuildingUpstream();
if (bup!=null)
return new BecauseOfUpstreamBuildInProgress(bup);
diff --git a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
index e4ad6c6..30b102c 100644
--- a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
+++ b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
@@ -29,6 +29,7 @@
<p:config-quietPeriod />
<p:config-retryCount />
<p:config-blockWhenUpstreamBuilding />
+ <p:config-blockWhenDownstreamBuilding />
<p:config-customWorkspace />
</f:advanced>
</f:section>