From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 18 Mar 2023 06:47:05 +0000 (+0100)
Subject: Fix logging
X-Git-Tag: v2.3.5~69
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=abfc87b5d18e7c5a8db62b5aa086d8d5710c6f79;p=cc0%2Fargeo-build.git

Fix logging
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 8d48c2f..e2a9e64 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -835,8 +835,8 @@ public class Repackage {
 				String value = entries.get(key);
 				String previousValue = manifest.getMainAttributes().getValue(key);
 				boolean wasDifferent = previousValue != null && !previousValue.equals(value);
+				boolean keepPrevious = false;
 				if (wasDifferent) {
-					boolean keepPrevious = false;
 					if (SPDX_LICENSE_IDENTIFIER.toString().equals(key) && previousValue != null)
 						keepPrevious = true;
 					else if (BUNDLE_VERSION.toString().equals(key) && wasDifferent)
@@ -852,7 +852,7 @@ public class Repackage {
 				}
 
 				manifest.getMainAttributes().putValue(key, value);
-				if (wasDifferent) {
+				if (wasDifferent && !keepPrevious) {
 					if (IMPORT_PACKAGE.toString().equals(key) || EXPORT_PACKAGE.toString().equals(key))
 						logger.log(TRACE, () -> file.getFileName() + ": " + key + " was modified");
 					else