[FIXED JENKINS-13264] Allow checkout of submodules

jenkinsci · Jun 4, 2012 · 70a90ec · 70a90ec
1 parent 64d4473
commit 70a90ec
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/hudson/scm/CVSSCM.java b/src/main/java/hudson/scm/CVSSCM.java
@@ -708,9 +708,14 @@ public boolean checkout(final AbstractBuild<?, ?> build, final Launcher launcher
 
                 for (CvsModule cvsModule : item.getModules()) {
 
-                    final FilePath targetWorkspace = flatten ? workspace.getParent() : workspace;
+                    boolean localSubModule = cvsModule.getCheckoutName().contains("/");
+                    int lastSlash = cvsModule.getCheckoutName().lastIndexOf("/");
 
-                    final String moduleName= flatten ? workspace.getName() : cvsModule.getCheckoutName();
+                    final FilePath targetWorkspace = flatten ? workspace.getParent() :
+                            localSubModule ? workspace.child(cvsModule.getCheckoutName().substring(0, lastSlash)) : workspace;
+
+                    final String moduleName = flatten ? workspace.getName() :
+                            localSubModule ? cvsModule.getCheckoutName().substring(lastSlash + 1) : cvsModule.getCheckoutName();
 
                     final FilePath module = targetWorkspace.child(moduleName);