Skip to content

Commit 1f83e13

Browse files
authored
Corrected patch format message (#55)
1 parent a2ecc18 commit 1f83e13

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -660,21 +660,11 @@ public static boolean validatePatchIds(List<String> patches, boolean rigid) {
660660
String error;
661661
if (rigid) {
662662
errorFormat = "12345678_12.2.1.3.0";
663-
error = String.format("Invalid patch id %s. Patch id must be in the format of %s"
664-
+ " starting with 8 digits patch ID. The release version as found by searching for "
665-
+ "patches on Oracle Support Site must be specified after the underscore with 5 places "
666-
+ "such as 12.2.1.3.0 or 12.2.1.3.190416", errorFormat, patchId);
667663
} else {
668664
errorFormat = "12345678[_12.2.1.3.0]";
669-
error = String.format("Invalid patch id %s. Patch id must be in the format of %s"
670-
+ " starting with 8 digits patch ID. For patches that has multiple target versions, "
671-
+ "the "
672-
+ "target must be specified after the underscore with 5 places such as 12.2.1.3.0 or "
673-
+ "12.2.1."
674-
+ "3.190416", errorFormat, patchId);
675665
}
676666

677-
logger.severe(error);
667+
logger.severe("IMG-0004", patchId, errorFormat);
678668
result = false;
679669
return result;
680670
}

imagetool/src/main/resources/ImageTool.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ IMG-0000=JAVA_HOME detected in base image, skipping JDK install: {0}
22
IMG-0001=Gathering installer {0}:{1}
33
IMG-0002=User specified fromImage {0}
44
IMG-0003=Temporary directory used for docker build context: {0}
5+
IMG-0004=Invalid patch id {0}. The patch id must be in the format of {1}. Where the first part is the 8 digit patch ID, and the second half, after the underscore, is the release version for the patch. The release version needs to be specified with 5 places such as 12.2.1.3.0 or 12.2.1.3.190416. Release version is required when adding a patch to the cache or when multiple versions of the same patch number exist for different versions.

0 commit comments

Comments
 (0)