From e00275f38eaa0061ea2b9fb8c029a67e0e70f28a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 14 Sep 2023 07:22:07 +0200 Subject: [PATCH] Fix clean of failed builds --- src/org/argeo/build/Repackage.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 310c6ca..d33a55e 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -99,7 +99,7 @@ public class Repackage { List> toDos = new ArrayList<>(); for (int i = 1; i < args.length; i++) { Path categoryPath = Paths.get(args[i]); - cleanPreviousFailedBuild(categoryPath); + factory.cleanPreviousFailedBuild(categoryPath); if (sequential) // sequential processing happens here factory.processCategory(categoryPath); else @@ -117,10 +117,11 @@ public class Repackage { } /** Deletes remaining sub directories. */ - static void cleanPreviousFailedBuild(Path categoryPath) { + void cleanPreviousFailedBuild(Path categoryPath) { + Path outputCategoryPath = a2Base.resolve(categoryPath); // clean previous failed build try { - for (Path subDir : Files.newDirectoryStream(categoryPath, (d) -> Files.isDirectory(d))) { + for (Path subDir : Files.newDirectoryStream(outputCategoryPath, (d) -> Files.isDirectory(d))) { if (Files.exists(subDir)) { logger.log(WARNING, "Bundle dir " + subDir + " already exists, probably from a previous failed build, deleting it..."); -- 2.30.2