Skip to content
Permalink
Browse files
Merge pull request #22 from rym002/JENKINS-25247
Jenkins 25247
  • Loading branch information
rym002 committed Sep 10, 2015
2 parents 35c03bd + 93c9765 commit da800d23b0eeef74128cd35e3e0d5b65b9a33ed3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
@@ -328,8 +328,8 @@ private void setStreamColor() {
}
}

protected boolean populate() {
if (isPopulateRequired()) {
protected boolean populate(boolean populateRequired) {
if (populateRequired) {
PopulateCmd pop = new PopulateCmd();
if (pop.populate(scm, launcher, listener, server, accurevPath, getPopulateStream(), true, getPopulateFromMessage(), accurevWorkingSpace, accurevEnv)) {
startDateOfPopulate = pop.get_startDateOfPopulate();
@@ -340,6 +340,10 @@ protected boolean populate() {
startDateOfPopulate = new Date();
}
return true;

}
protected boolean populate() {
return populate(isPopulateRequired());
}

public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
@@ -133,16 +133,15 @@ protected boolean checkout(AbstractBuild<?, ?> build, File changeLogFile) throws
if (!relocate(relocation)) {
return false;
}
if (popRequired) {
if (!populate()) {
return false;
}
if (!populate(popRequired)) {
return false;
}
}

return doUpdate(changeLogFile);
}


private boolean doUpdate(File changeLogFile) throws IOException, InterruptedException {
updateLogFile = XmlConsolidateStreamChangeLog.getUpdateChangeLogFile(changeLogFile);
return Update.performUpdate(scm, server, accurevEnv, accurevWorkingSpace, listener, accurevPath, launcher, getRefTree(), updateLogFile);

0 comments on commit da800d2

Please sign in to comment.