projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe6c61f
)
Fix logging
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 18 Mar 2023 06:47:05 +0000
(07:47 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 18 Mar 2023 06:47:05 +0000
(07:47 +0100)
src/org/argeo/build/Repackage.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index 8d48c2f9f6e2a47a128cc8222e4a7f07684944fe..e2a9e64b38b48176efc7be8b4ebf8ca8bf8931d6 100644
(file)
--- 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);
String value = entries.get(key);
String previousValue = manifest.getMainAttributes().getValue(key);
boolean wasDifferent = previousValue != null && !previousValue.equals(value);
+ boolean keepPrevious = false;
if (wasDifferent) {
if (wasDifferent) {
- boolean keepPrevious = false;
if (SPDX_LICENSE_IDENTIFIER.toString().equals(key) && previousValue != null)
keepPrevious = true;
else if (BUNDLE_VERSION.toString().equals(key) && wasDifferent)
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);
}
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
if (IMPORT_PACKAGE.toString().equals(key) || EXPORT_PACKAGE.toString().equals(key))
logger.log(TRACE, () -> file.getFileName() + ": " + key + " was modified");
else