You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2010/09/22 07:42:20 UTC
svn commit: r999764 -
/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
Author: ctan
Date: Wed Sep 22 05:42:19 2010
New Revision: 999764
URL: http://svn.apache.org/viewvc?rev=999764&view=rev
Log:
improve logs when checking the scm result during the build
Modified:
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=999764&r1=999763&r2=999764&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Wed Sep 22 05:42:19 2010
@@ -112,7 +112,6 @@ public class BuildProjectTaskExecutor
if ( !checkScmResult( context ) )
{
- log.info( "Error updating from SCM, not building" );
return;
}
@@ -199,8 +198,17 @@ public class BuildProjectTaskExecutor
private boolean checkScmResult( BuildContext buildContext )
{
- return !( buildContext.getScmResult() == null || !buildContext.getScmResult().isSuccess() );
-
+ if ( buildContext.getScmResult() == null )
+ {
+ log.info( "Error updating from SCM, SCM result is null, not building" );
+ return false;
+ }
+ else if ( !buildContext.getScmResult().isSuccess() )
+ {
+ log.info( "Error updating from SCM, SCM result has errors, not building" );
+ return false;
+ }
+ return true;
}
private void startBuild( BuildContext buildContext )