Merge pull request #27 from hrzlgnm/master

[FIXED JENKINS-20317] Don't prune module if it's not a directory
jenkinsci · Nov 6, 2013 · eb2a491 · eb2a491
2 parents 683b9ee + 2f35d9d
commit eb2a491
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/hudson/scm/AbstractCvs.java b/src/main/java/hudson/scm/AbstractCvs.java
@@ -267,7 +267,10 @@ public Boolean invoke(final File workspace, final VirtualChannel channel) throws
                     }
                     if (pruneEmptyDirectories && !isDisableCvsQuiet()) {
                         try {
-                            pruneEmptyDirectories(new File(workspace, moduleName));
+                            File moduleDir = new File(workspace, moduleName);
+                            if (moduleDir.isDirectory()) {
+                                pruneEmptyDirectories(moduleDir);
+                            }
                         } catch (IOException e) {
                             e.printStackTrace(listener.error("CVS empty directory cleanup failed: " + e.getMessage()));
                             return false;