From 5780358cbe118241527a5813055fa2a277ef78bc Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 29 Oct 2022 09:18:57 +0200
Subject: [PATCH] Do not override singleton when it is unnecessary.

---
 src/org/argeo/build/Repackage.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 9312320..df63005 100644
--- 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()) {
-- 
2.30.2