Add codes to handle ReadonlyUpdateInstalled pkg

- When readonlyupdateinstalled pkg version is higher than
  FOTA-updated pkg, pkg version should be preserved.

Change-Id: I48e5718dca83db7e2777f51c6750f4d44478a37a
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
(cherry picked from commit d548af7bc59450f6348fff8697e3ee4321292044)

diff --git a/src/pkg_upgrade.c b/src/pkg_upgrade.c
index 4ab5d777700648824db7d2b52ca648541237f4d6..d1e93f3e42faa67494d225741abbc7e3988afd46 100644 (file)
--- a/src/pkg_upgrade.c
+++ b/src/pkg_upgrade.c
@@ -336,6 +336,12 @@ static int __compare_pkgid(char *file_path, char *fota_pkgid,
                                FREE_AND_NULL(version);
                                FREE_AND_NULL(update);
                                break;
+                       } else if (compare == PMINFO_VERSION_OLD) {
+                               ret = PKG_IS_OLD;
+                               FREE_AND_NULL(pkgid);
+                               FREE_AND_NULL(version);
+                               FREE_AND_NULL(update);
+                               break;
                        }
 
                        FREE_AND_NULL(pkgid);

diff --git a/src/pkg_upgrade.h b/src/pkg_upgrade.h
index e8d0e2f22e2c87f657977ba877b4d95b38d1b574..d02253e4e4e5ab361b5c3094ccf1f33283a485f0 100644 (file)
--- a/src/pkg_upgrade.h
+++ b/src/pkg_upgrade.h
@@ -93,7 +93,8 @@ typedef enum {
        PKG_IS_NOT_EXIST = 0,
        PKG_IS_SAME,
        PKG_IS_UPDATED,
-       PKG_IS_INSERTED
+       PKG_IS_INSERTED,
+       PKG_IS_OLD
 } COMPARE_RESULT;
 
 typedef enum {