From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Sep 2023 05:22:07 +0000 (+0200)
Subject: Fix clean of failed builds
X-Git-Tag: v2.3.8~14
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=e00275f38eaa0061ea2b9fb8c029a67e0e70f28a

Fix clean of failed builds
---

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<CompletableFuture<Void>> 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...");