Skip to content

Commit 5e3c761

Browse files
jshum2479rjeberhard
authored andcommitted
Merge branch 'fix-unzip-returncode-check' into 'main'
Fix unzip return code check to exclude warning mistaken as error See merge request weblogic-cloud/weblogic-kubernetes-operator!4691 (cherry picked from commit bd1b2c0) 3b9bdeb Fix unzip return code check to exclude warning mistaken as error
1 parent f27824a commit 5e3c761

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

operator/src/main/resources/scripts/modelInImage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ restoreAppAndLibs() {
13491349
# zip, the original xml in the archive may have wdt tokenized notations.
13501350
cd ${DOMAIN_HOME} || return 1
13511351
unzip -o ${IMG_ARCHIVES_ROOTDIR}/${file} -x "wlsdeploy/domainBin/*" "wlsdeploy/domainLibraries/*" "config/*"
1352-
if [ $? -ne 0 ] ; then
1352+
if [ $? -ne 0 ] && [ $ret -ne 11 ] ; then
13531353
trace SEVERE "Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR}/${file}"
13541354
return 1
13551355
fi

0 commit comments

Comments
 (0)