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 (file)
--- 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 (file)
--- 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}')