Do not override singleton when it is unnecessary.

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 931232010f60eadb50faefdb5bd18a2ffe8b53f6..df630055aec75973df0dbbf5046d57324bdcdabb 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -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()) {