X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=1debe690812e24f7aac1ca63e42ead4794ade8a2;hb=e927d33bc0cca8935f7682588f9954d91f94136a;hp=931232010f60eadb50faefdb5bd18a2ffe8b53f6;hpb=0cdbfec3a295eb260f56fbca13914f0d19fef0f2;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 9312320..1debe69 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -609,7 +609,7 @@ public class Repackage {
 						if (includeMatcher.matches(file)) {
 							for (PathMatcher excludeMatcher : excludeMatchers) {
 								if (excludeMatcher.matches(file)) {
-									logger.log(Level.WARNING, "Skipping excluded " + file);
+									logger.log(Level.TRACE, "Skipping excluded " + file);
 									return FileVisitResult.CONTINUE;
 								}
 							}
@@ -802,8 +802,9 @@ public class Repackage {
 			Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
 			Files.createDirectories(manifestPath.getParent());
 
-			if (isSingleton) {
-				entries.put(BUNDLE_SYMBOLICNAME.toString(), nameVersion.getName() + "; singleton:=true");
+			if (isSingleton && entries.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+				entries.put(BUNDLE_SYMBOLICNAME.toString(),
+						entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true");
 			}
 
 			for (String key : entries.keySet()) {