projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
be6644e
)
Fix uninstall of repackaged jars
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 11:01:02 +0000
(12:01 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 11:01:02 +0000
(12:01 +0100)
src/org/argeo/build/Make.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Make.java
b/src/org/argeo/build/Make.java
index fa464989793ba95b1ce4b2879d4c076bb3ebe5ac..62ef0b61e248fc23a33997101353939daed33049 100644
(file)
--- a/
src/org/argeo/build/Make.java
+++ b/
src/org/argeo/build/Make.java
@@
-418,8
+418,12
@@
public class Make {
void deleteEmptyParents(Path baseDir, Path targetParent) throws IOException {
if (!targetParent.startsWith(baseDir))
throw new IllegalArgumentException(targetParent + " does not start with " + baseDir);
void deleteEmptyParents(Path baseDir, Path targetParent) throws IOException {
if (!targetParent.startsWith(baseDir))
throw new IllegalArgumentException(targetParent + " does not start with " + baseDir);
- if (!Files.exists(targetParent))
+ if (!Files.exists(baseDir))
+ return;
+ if (!Files.exists(targetParent)) {
deleteEmptyParents(baseDir, targetParent.getParent());
deleteEmptyParents(baseDir, targetParent.getParent());
+ return;
+ }
if (!Files.isDirectory(targetParent))
throw new IllegalArgumentException(targetParent + " must be a directory");
boolean isA2target = Files.isSameFile(baseDir, targetParent);
if (!Files.isDirectory(targetParent))
throw new IllegalArgumentException(targetParent + " must be a directory");
boolean isA2target = Files.isSameFile(baseDir, targetParent);