Skip to content

Commit 4897678

Browse files
authored
Reject Stack Patch Bundle as a patch from ARU (#260)
1 parent 5eef5e7 commit 4897678

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruPatch.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ public static List<AruPatch> getPatches(Document patchList, String patchSelector
191191
.downloadHost(XPathUtil.string(nodeList.item(i), "./files/file/download_url/@host"))
192192
.downloadPath(XPathUtil.string(nodeList.item(i), "./files/file/download_url/text()"));
193193

194+
// Stack Patch Bundle (SPB) is not a traditional patch. Patches in SPB are duplicates of recommended.
195+
if (patch.description.contains("STACK PATCH BUNDLE")) {
196+
logger.fine("Discarded Stack Patch Bundle: {0}", patch.description);
197+
continue;
198+
}
194199
int index = patch.downloadPath().indexOf("patch_file=");
195200
if (index < 0) {
196201
throw new XPathExpressionException(Utils.getMessage("IMG-0059", patch.patchId()));

imagetool/src/test/resources/recommended-patches.xml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,52 @@
22
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
33

44
<results md5_sum="a814ac2fcb8f44d2757c0fcac92d451d">
5-
<generated_date in_epoch_ms="1598301753000">2020-08-24 20:42:33</generated_date>
5+
<patch has_prereqs="n" has_postreqs="n" is_system_patch="n">
6+
<bug>
7+
<number>32755791</number>
8+
<abstract><![CDATA[WLS STACK PATCH BUNDLE 12.2.1.3.200624]]></abstract>
9+
</bug>
10+
<name>32755791</name>
11+
<type>Patch</type>
12+
<psu_bundle>Oracle WebLogic Server 12.2.1.3.200624</psu_bundle>
13+
<status>Available</status>
14+
<access id="m">Open access</access>
15+
<url>
16+
<patch_readme host="https://updates.oracle.com"><![CDATA[/blah/blah]]></patch_readme>
17+
<patch_details><![CDATA[/download/32755791.html]]></patch_details>
18+
</url>
19+
<request_id>24172184</request_id>
20+
<product id="15991" bugdb_id="5242"><![CDATA[Oracle WebLogic Server]]></product>
21+
<release id="600000000073715" name="12.2.1.3.0" platform_patch_not_required="Y" cc="Y"><![CDATA[Oracle WebLogic Server 12.2.1.3.0]]></release>
22+
<platform id="2000" bugdb_id="289"><![CDATA[Generic Platform]]></platform>
23+
<language id="0" iso_code="EN"><![CDATA[American English]]></language>
24+
<translations_available>No</translations_available>
25+
<classification id="185">Security</classification>
26+
<patch_classification id="185">Security</patch_classification>
27+
<life_cycle id="175">Recommended</life_cycle>
28+
<support_level id="G">General Support</support_level>
29+
<entitlements>
30+
<entitlement code="SW"/>
31+
</entitlements>
32+
<fixes_bugs truncated="no">
33+
<bug>
34+
<number>32755791</number>
35+
<abstract><![CDATA[WLS STACK PATCH BUNDLE 12.2.1.3.200624]]></abstract>
36+
</bug>
37+
</fixes_bugs>
38+
<size>417431395</size>
39+
<files>
40+
<file>
41+
<name>p32755791_122140_Generic.zip</name>
42+
<size>417431395</size>
43+
<download_url host="https://updates.oracle.com"><![CDATA[/blah/blah/Generic.zip]]></download_url>
44+
<digest type="SHA-256">1111</digest>
45+
<digest type="SHA-1">22222</digest>
46+
</file>
47+
</files>
48+
<updated_date in_epoch_ms="1618932313000">2021-04-20 15:25:13</updated_date>
49+
<released_date in_epoch_ms="1618932312000">2021-04-20 15:25:12</released_date>
50+
</patch>
651
<patch has_prereqs="n" has_postreqs="n" is_system_patch="n">
752
<bug>
853
<number>31544340</number>

0 commit comments

Comments
 (0)