mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
22 lines
1.0 KiB
Diff
22 lines
1.0 KiB
Diff
|
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||
|
|
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
|
||
|
|
@@ -112,18 +112,6 @@
|
||
|
|
.filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
|
||
|
|
.findFirst();
|
||
|
|
if (!otarget.isPresent()) {
|
||
|
|
- if (errorIfNotSameContent) {
|
||
|
|
- // all legal notices of the same file name are expected
|
||
|
|
- // to contain the same content
|
||
|
|
- Optional<ResourcePoolEntry> ores =
|
||
|
|
- entries.stream().filter(e -> e.linkedTarget() == null)
|
||
|
|
- .findAny();
|
||
|
|
-
|
||
|
|
- if (ores.isPresent()) {
|
||
|
|
- throw new PluginException(ores.get().path() + " " +
|
||
|
|
- entry.path() + " contain different content");
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
entries.add(entry);
|
||
|
|
} else {
|
||
|
|
entries.add(ResourcePoolEntry.createSymLink(entry.path(),
|