Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- fixed JENKINS-13440
  • Loading branch information
mbechtol authored and mbechtol committed Nov 25, 2015
1 parent 2113a1f commit d90a60c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/main/java/hudson/ivy/IvyBuild.java
Expand Up @@ -410,7 +410,8 @@ private class RunnerImpl extends AbstractRunner {
@Override
protected Lease decideWorkspace(Node n, WorkspaceList wsl) throws InterruptedException, IOException {
String pathToModuleRoot = IvyBuild.this.getProject().getRelativePathToModuleRoot();
return wsl.allocate(getModuleSetBuild().getModuleRoot().child(pathToModuleRoot));
// 2015-11-25 Matthias Bechtold: changed base path to workspace folder - fixes JENKINS-13440
return wsl.allocate(getModuleSetBuild().getWorkspace().child(pathToModuleRoot));
}

@Override
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/hudson/ivy/IvyModuleSetBuild.java
Expand Up @@ -530,11 +530,13 @@ private void parseIvyDescriptorFiles(BuildListener listener, PrintStream logger,
logger.println("Parsing Ivy Descriptor Files");

List<IvyModuleInfo> ivyDescriptors;
try {
IvyXmlParser parser = new IvyXmlParser(listener, project, settings, getModuleRoot().getRemote());
if (getModuleRoot().getChannel() instanceof Channel)
((Channel) getModuleRoot().getChannel()).preloadJar(parser, Ivy.class);
ivyDescriptors = getModuleRoot().act(parser);
// 2015-11-25 Matthias Bechtold: Parse all modules in workspace rather than the first module's folder - fixes JENKINS-13440
FilePath moduleRoot = getModuleRoots().length>1 ? getModuleRoot().getParent() : getModuleRoot();
try {
IvyXmlParser parser = new IvyXmlParser(listener, project, settings, moduleRoot.getRemote());
if (moduleRoot.getChannel() instanceof Channel)
((Channel) moduleRoot.getChannel()).preloadJar(parser, Ivy.class);
ivyDescriptors = moduleRoot.act(parser);
} catch (IOException e) {
if (e.getCause() instanceof AbortException)
throw (AbortException) e.getCause();
Expand Down

0 comments on commit d90a60c

Please sign in to comment.