From: Mateusz Moscicki <m.moscicki2@partner.samsung.com>
Date: Thu, 28 Sep 2023 14:02:35 +0000 (+0200)
Subject: Remove installed ISU package if the new Tizen does not contain it
X-Git-Tag: accepted/tizen/unified/20231004.100253^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c66a3dec42d58a536dfe2ebd7711c5053a26cbf7;p=platform%2Fcore%2Fsystem%2Fupgrade.git

Remove installed ISU package if the new Tizen does not contain it

Change-Id: I60f957afb64c438ab99fff52272a83a4e6841e2c
---

diff --git a/packaging/upgrade.spec b/packaging/upgrade.spec
index 023c44e..52563e3 100644
--- a/packaging/upgrade.spec
+++ b/packaging/upgrade.spec
@@ -3,7 +3,7 @@
 
 Name:       	upgrade
 Summary:    	Upgrade support for Tizen
-Version:    	8.0.2
+Version:    	8.0.3
 Release:    	0
 Group:      	System
 License:    	Apache-2.0
diff --git a/scripts/rw-upgrade/update.sh.in b/scripts/rw-upgrade/update.sh.in
index d3ed298..401b38c 100644
--- a/scripts/rw-upgrade/update.sh.in
+++ b/scripts/rw-upgrade/update.sh.in
@@ -126,9 +126,11 @@ REMOVE_UNNECESSARY_ISU_PKGS()
 		fi
 	fi
 
-	for ISUCFG in $(find /etc/isu/ -type f -name isu.cfg); do
+	for ISUCFG in $(find /opt/isu/ -maxdepth 2 -type f -name isu.cfg); do
 		PKG_NAME=$(basename "$(dirname "$ISUCFG")")
-		if [ ! -d "/opt/isu/$PKG_NAME" ]; then
+		if [ ! -d "/etc/isu/$PKG_NAME" ]; then
+			NOTIFY "Platform image does not contain information about ${PKG_NAME} - unable to verify which is newer (ISU or Platform). Dropping ISU package ${PKG_NAME}."
+			REMOVE_ISU_PKG "$PKG_NAME"
 			continue
 		fi
 		CUR_IMG_VERSION=$(grep -e "^version" "/etc/isu/$PKG_NAME/isu.cfg" | awk -F "=" '{ gsub(/[ ]+/, ""); print $2}')