Merge pull request #17 from svogt/master

[JENKINS-16412] Don't use local name on workspace cleanup if flatten is true
jenkinsci · Jan 18, 2013 · e1d22aa · e1d22aa
2 parents 7366c49 + 213d625
commit e1d22aa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/hudson/scm/AbstractCvs.java b/src/main/java/hudson/scm/AbstractCvs.java
@@ -678,7 +678,8 @@ protected void postCheckout(AbstractBuild<?, ?> build, File changelogFile, CvsRe
         for (final CvsRepository repository : getRepositories()) {
             for (final CvsRepositoryItem repositoryItem : repository.getRepositoryItems()) {
                 for (final CvsModule module : repositoryItem.getModules()) {
-                    workspace.child(module.getCheckoutName()).act(new FilePath.FileCallable<Void>() {
+                    FilePath target = (flatten ? workspace : workspace.child(module.getCheckoutName()));
+                    target.act(new FilePath.FileCallable<Void>() {
                         @Override
                         public Void invoke(File module, VirtualChannel virtualChannel) throws IOException, InterruptedException {
                             final AdminHandler adminHandler = new StandardAdminHandler();
@@ -809,4 +810,4 @@ public ChangeLogParser createChangeLogParser() {
     }
 
 
-}
+}