Sync to the latest code

1. remove entry of mmc path during pkg is moving
2. add dirname for debugging in print message

Change-Id: I1050bdc31b25d1b653eeecc68b5b426d67d0c721
Signed-off-by: junsuk77.oh <junsuk77.oh@samsung.com>

diff --git a/plugin/app2sd/src/app2sd_internals.c b/plugin/app2sd/src/app2sd_internals.c
index 8ba3f46..d9edb4d 100755 (executable)
--- a/plugin/app2sd/src/app2sd_internals.c
+++ b/plugin/app2sd/src/app2sd_internals.c
@@ -705,11 +705,18 @@ int _app2sd_move_app_to_external(const char *pkgid, GList* dir_list)
        /*check whether application is in external memory or not */
        fp = fopen(mmc_path, "r+");
        if (fp != NULL) {
+               const char *argv[] = { "/bin/rm", "-rf", mmc_path, NULL };
                app2ext_print
-                   ("Already %s entry is present in the SD Card\n",
+                   ("Already %s entry is present in the SD Card, delete entry and go on without return\n",
                     pkgid);
                fclose(fp);
-               return APP2EXT_ERROR_ALREADY_FILE_PRESENT;
+//             return APP2EXT_ERROR_ALREADY_FILE_PRESENT;
+               ret = _xsystem(argv);
+               if (ret) {
+                       app2ext_print
+                               ("delete fail[%s]\n",
+                               mmc_path);
+               }
        }
 
        snprintf(app_mmc_path, FILENAME_MAX,

diff --git a/plugin/app2sd/src/app2sd_internals_utils.c b/plugin/app2sd/src/app2sd_internals_utils.c
index 38562ed..e49bd11 100755 (executable)
--- a/plugin/app2sd/src/app2sd_internals_utils.c
+++ b/plugin/app2sd/src/app2sd_internals_utils.c
@@ -170,7 +170,7 @@ int _app2sd_delete_directory(char *dirname)
                if (ret <0)
                        return -1;
        } else {
-               app2ext_print("Couldn't open the directory\n");
+               app2ext_print("Couldn't open the directory[%s]\n", dirname);
        }
        return 0;
 }