Remove preload-rw pkgs after install 90/231690/5
authorSangyoon Jang <jeremy.jang@samsung.com>
Thu, 23 Apr 2020 11:30:18 +0000 (20:30 +0900)
committerSangyoon Jang <jeremy.jang@samsung.com>
Mon, 27 Apr 2020 06:29:46 +0000 (15:29 +0900)
These packages were backuped already.

Change-Id: Ibca7ca4ab358788759c90c28e9a24eee10866e97
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
src/install_preload_pkg.c

index e53ab34..48576cc 100644 (file)
@@ -144,20 +144,7 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                        waitpid(pid, &status, 0);
                }
 
-               /* remove a file after installation,
-                * keep rw packages for factory-reset
-                */
-               if (readonly) {
-                       ret = remove(file_path);
-                       if (ret < 0) {
-                               _E("Failed to remove [%s]: [%s]",
-                                       file_path, strerror_r(errno, err_buf,
-                                       sizeof(err_buf)));
-                               closedir(dir);
-                               g_list_free_full(preload_rw_pkg_list, free);
-                               return -1;
-                       }
-               } else {
+               if (!readonly) {
                        // make the preload-rw list
                        pkg_info = pkgmgr_client_check_pkginfo_from_file(file_path);
                        if (pkg_info == NULL) {
@@ -170,6 +157,17 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                        pkgmgr_client_free_pkginfo(pkg_info);
                        pkg_info = NULL;
                }
+
+               /* remove a file after installation */
+               ret = remove(file_path);
+               if (ret < 0) {
+                       _E("Failed to remove [%s]: [%s]", file_path,
+                                       strerror_r(errno, err_buf,
+                                                       sizeof(err_buf)));
+                       closedir(dir);
+                       g_list_free_full(preload_rw_pkg_list, free);
+                       return -1;
+               }
        }
 
        closedir(dir);