Skip to content

Commit 5141726

Browse files
committed
Merge branch 'fix-mii-script-error' into 'main'
Fix unzip recode check error See merge request weblogic-cloud/weblogic-kubernetes-operator!4709 (cherry picked from commit 71a3eb6) e849c84 Fix unzip recode check error
1 parent 5e3c761 commit 5141726

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,8 @@ 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 ] && [ $ret -ne 11 ] ; then
1352+
ret=$?
1353+
if [ $ret -ne 0 ] && [ $ret -ne 11 ] ; then
13531354
trace SEVERE "Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR}/${file}"
13541355
return 1
13551356
fi

0 commit comments

Comments
 (0)