From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 18 Mar 2023 07:35:25 +0000 (+0100)
Subject: Improve logging
X-Git-Tag: v2.3.5~63
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=d535ee655bd19859f149bdb2d98fa9b47e60f1fa;p=cc0%2Fargeo-build.git

Improve logging
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 1b2d6d1..2df1aa3 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -75,6 +75,7 @@ public class Repackage {
 	final static boolean parallel = true;
 
 	// cache
+	/** Summary of all license seen during the repackaging. */
 	final static Map<String, Set<String>> licensesUsed = new TreeMap<>();
 
 	/** Main entry point. */
@@ -101,7 +102,7 @@ public class Repackage {
 		StringBuilder sb = new StringBuilder();
 		for (String licenseId : licensesUsed.keySet())
 			for (String name : licensesUsed.get(licenseId))
-				sb.append(licenseId + "\t" + name + "\n");
+				sb.append(licenseId + "\t\t\t" + name + "\n");
 		logger.log(INFO, "# License summary:\n" + sb);
 	}
 
@@ -889,7 +890,7 @@ public class Repackage {
 			} else {
 				if (!licensesUsed.containsKey(spdxLicenceId))
 					licensesUsed.put(spdxLicenceId, new TreeSet<>());
-				licensesUsed.get(spdxLicenceId).add(file.getFileName().toString());
+				licensesUsed.get(spdxLicenceId).add(nameVersion.toString());
 			}
 
 			try (OutputStream out = Files.newOutputStream(manifestPath)) {