Adjust to fix of installer error codes

Submit with:
 - https://review.tizen.org/gerrit/101411
 - https://review.tizen.org/gerrit/101409

Change-Id: I34988f139f697f28192dd36b98c5ab45181e145f
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/src/pkg_cmd.c b/src/pkg_cmd.c
index 108b0a055d80927dfc81f86633a648796e64a416..980e09a9b6bbb5af883f4ccb720ccee2a3a05540 100644 (file)
--- a/src/pkg_cmd.c
+++ b/src/pkg_cmd.c
@@ -38,6 +38,7 @@
 #include <sqlite3.h>
 
 #include <pkgmgr-info.h>
+#include <pkgmgr_installer_error.h>
 /* For multi-user support */
 #include <tzplatform_config.h>
 
@@ -155,86 +156,86 @@ static void __error_no_to_string(int errnumber, char **errstr)
        if (errstr == NULL)
                return;
        switch (errnumber) {
-       case PKGCMD_ERRCODE_GLOBALSYMLINK_ERROR:
-               *errstr = PKGCMD_ERRCODE_GLOBALSYMLINK_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_GLOBALSYMLINK_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_GLOBALSYMLINK_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_GRANT_PERMISSION_ERROR:
-               *errstr = PKGCMD_ERRCODE_GRANT_PERMISSION_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_GRANT_PERMISSION_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_GRANT_PERMISSION_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_IMAGE_ERROR:
-               *errstr = PKGCMD_ERRCODE_IMAGE_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_IMAGE_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_IMAGE_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_UNZIP_ERROR:
-               *errstr = PKGCMD_ERRCODE_UNZIP_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_UNZIP_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_UNZIP_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_SECURITY_ERROR:
-               *errstr = PKGCMD_ERRCODE_SECURITY_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_SECURITY_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_SECURITY_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_REGISTER_ERROR:
-               *errstr = PKGCMD_ERRCODE_REGISTER_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_REGISTER_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_REGISTER_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_PRIVILEGE_ERROR:
-               *errstr = PKGCMD_ERRCODE_PRIVILEGE_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_PRIVILEGE_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_PRIVILEGE_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_PARSE_ERROR:
-               *errstr = PKGCMD_ERRCODE_PARSE_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_PARSE_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_PARSE_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_RECOVERY_ERROR:
-               *errstr = PKGCMD_ERRCODE_RECOVERY_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_RECOVERY_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_RECOVERY_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_DELTA_ERROR:
-               *errstr = PKGCMD_ERRCODE_DELTA_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_DELTA_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_DELTA_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_APP_DIR_ERROR:
-               *errstr = PKGCMD_ERRCODE_APP_DIR_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_APP_DIR_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_APP_DIR_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_CONFIG_ERROR:
-               *errstr = PKGCMD_ERRCODE_CONFIG_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_CONFIG_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_CONFIG_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_SIGNATURE_ERROR:
-               *errstr = PKGCMD_ERRCODE_SIGNATURE_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_SIGNATURE_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_SIGNATURE_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_SIGNATURE_INVALID:
-               *errstr = PKGCMD_ERRCODE_SIGNATURE_INVALID_STR;
+       case PKGMGR_INSTALLER_ERRCODE_SIGNATURE_INVALID:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_SIGNATURE_INVALID_STR;
                break;
-       case PKGCMD_ERRCODE_CERT_ERROR:
-               *errstr = PKGCMD_ERRCODE_CERT_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_CERT_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_CERT_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_AUTHOR_CERT_NOT_MATCH:
-               *errstr = PKGCMD_ERRCODE_AUTHOR_CERT_NOT_MATCH_STR;
+       case PKGMGR_INSTALLER_ERRCODE_AUTHOR_CERT_NOT_MATCH:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_AUTHOR_CERT_NOT_MATCH_STR;
                break;
-       case PKGCMD_ERRCODE_AUTHOR_CERT_NOT_FOUND:
-               *errstr = PKGCMD_ERRCODE_AUTHOR_CERT_NOT_FOUND_STR;
+       case PKGMGR_INSTALLER_ERRCODE_AUTHOR_CERT_NOT_FOUND:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_AUTHOR_CERT_NOT_FOUND_STR;
                break;
-       case PKGCMD_ERRCODE_ICON_ERROR:
-               *errstr = PKGCMD_ERRCODE_ICON_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_ICON_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_ICON_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_ICON_NOT_FOUND:
-               *errstr = PKGCMD_ERRCODE_ICON_NOT_FOUND_STR;
+       case PKGMGR_INSTALLER_ERRCODE_ICON_NOT_FOUND:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_ICON_NOT_FOUND_STR;
                break;
-       case PKGCMD_ERRCODE_MANIFEST_ERROR:
-               *errstr = PKGCMD_ERRCODE_MANIFEST_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_MANIFEST_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_MANIFEST_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_MANIFEST_NOT_FOUND:
-               *errstr = PKGCMD_ERRCODE_MANIFEST_NOT_FOUND_STR;
+       case PKGMGR_INSTALLER_ERRCODE_MANIFEST_NOT_FOUND:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_MANIFEST_NOT_FOUND_STR;
                break;
-       case PKGCMD_ERRCODE_PACKAGE_NOT_FOUND:
-               *errstr = PKGCMD_ERRCODE_PACKAGE_NOT_FOUND_STR;
+       case PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND_STR;
                break;
-       case PKGCMD_ERRCODE_OPERATION_NOT_ALLOWED:
-               *errstr = PKGCMD_ERRCODE_OPERATION_NOT_ALLOWED_STR;
+       case PKGMGR_INSTALLER_ERRCODE_OPERATION_NOT_ALLOWED:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_OPERATION_NOT_ALLOWED_STR;
                break;
-       case PKGCMD_ERRCODE_OUT_OF_SPACE:
-               *errstr = PKGCMD_ERRCODE_OUT_OF_SPACE_STR;
+       case PKGMGR_INSTALLER_ERRCODE_OUT_OF_SPACE:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_OUT_OF_SPACE_STR;
                break;
-       case PKGCMD_ERRCODE_INVALID_VALUE:
-               *errstr = PKGCMD_ERRCODE_INVALID_VALUE_STR;
+       case PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE_STR;
                break;
-       case PKGCMD_ERRCODE_ERROR:
-               *errstr = PKGCMD_ERRCODE_ERROR_STR;
+       case PKGMGR_INSTALLER_ERRCODE_ERROR:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_ERROR_STR;
                break;
-       case PKGCMD_ERRCODE_OK:
-               *errstr = PKGCMD_ERRCODE_OK_STR;
+       case PKGMGR_INSTALLER_ERRCODE_OK:
+               *errstr = PKGMGR_INSTALLER_ERRCODE_OK_STR;
                break;
        default:
                *errstr = "Undefined Error";
@@ -278,7 +279,7 @@ static int __return_cb(uid_t target_uid, int req_id, const char *pkg_type,
 
        if (strncmp(key, "end", strlen("end")) == 0) {
                if ((strncmp(val, "fail", strlen("fail")) == 0) && data.result == 0)
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                g_main_loop_quit(main_loop);
        }
 
@@ -302,7 +303,7 @@ static int __app_return_cb(uid_t target_uid, int req_id, const char *pkg_type,
 
        if (strncmp(key, "end", strlen("end")) == 0) {
                if ((strncmp(val, "fail", strlen("fail")) == 0) && data.result == 0)
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                g_main_loop_quit(main_loop);
        }
 
@@ -602,14 +603,14 @@ static int __process_request(uid_t target_uid)
                if (data.pkg_path[0] == '\0') {
                        printf("Please provide the arguments.\n");
                        printf("use -h option to see usage\n");
-                       data.result = PKGCMD_ERRCODE_INVALID_VALUE;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE;
                        break;
                }
                main_loop = g_main_loop_new(NULL, FALSE);
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -628,9 +629,9 @@ static int __process_request(uid_t target_uid)
                                        NULL, PM_QUIET, __return_cb, pc, target_uid);
 
                if (ret < 0) {
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        if (access(data.pkg_path, F_OK) != 0)
-                               data.result = PKGCMD_ERRCODE_PACKAGE_NOT_FOUND;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND;
                        break;
                }
                g_main_loop_run(main_loop);
@@ -688,14 +689,14 @@ static int __process_request(uid_t target_uid)
                if (data.pkgid[0] == '\0') {
                        printf("Please provide the arguments.\n");
                        printf("use -h option to see usage\n");
-                       data.result = PKGCMD_ERRCODE_INVALID_VALUE;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE;
                        break;
                }
                main_loop = g_main_loop_new(NULL, FALSE);
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -708,9 +709,9 @@ static int __process_request(uid_t target_uid)
                ret = pkgmgr_client_usr_uninstall(pc, data.pkg_type, data.pkgid,
                                PM_QUIET, __return_cb, NULL, target_uid);
                if (ret < 0) {
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        if (access(data.pkg_path, F_OK) != 0)
-                               data.result = PKGCMD_ERRCODE_PACKAGE_NOT_FOUND;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND;
                        break;
                }
                g_main_loop_run(main_loop);
@@ -721,22 +722,22 @@ static int __process_request(uid_t target_uid)
                if (data.pkgid[0] == '\0') {
                        printf("Please provide the arguments.\n");
                        printf("use -h option to see usage\n");
-                       data.result = PKGCMD_ERRCODE_INVALID_VALUE;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE;
                        break;
                }
                main_loop = g_main_loop_new(NULL, FALSE);
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
                ret = pkgmgr_client_usr_reinstall(pc, NULL, data.pkgid, NULL, PM_QUIET, __return_cb, pc, target_uid);
                if (ret < 0) {
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        if (access(data.pkg_path, F_OK) != 0)
-                               data.result = PKGCMD_ERRCODE_PACKAGE_NOT_FOUND;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND;
                        break;
                }
                g_main_loop_run(main_loop);
@@ -746,14 +747,14 @@ static int __process_request(uid_t target_uid)
                if (data.pkg_path[0] == '\0') {
                        printf("Please provide the arguments.\n");
                        printf("use -h option to see usage\n");
-                       data.result = PKGCMD_ERRCODE_INVALID_VALUE;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE;
                        break;
                }
                main_loop = g_main_loop_new(NULL, FALSE);
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -772,9 +773,9 @@ static int __process_request(uid_t target_uid)
                                        NULL, PM_QUIET, __return_cb, pc, target_uid);
 
                if (ret < 0) {
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        if (access(data.pkg_path, F_OK) != 0)
-                               data.result = PKGCMD_ERRCODE_PACKAGE_NOT_FOUND;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_PACKAGE_NOT_FOUND;
                        break;
                }
                g_main_loop_run(main_loop);
@@ -996,14 +997,14 @@ static int __process_request(uid_t target_uid)
                if (data.pkgid[0] == '\0') {
                        printf("Please provide the arguments.\n");
                        printf("use -h option to see usage\n");
-                       data.result = PKGCMD_ERRCODE_INVALID_VALUE;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_INVALID_VALUE;
                        break;
                }
 
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -1011,7 +1012,7 @@ static int __process_request(uid_t target_uid)
                        ret = pkgmgr_client_usr_request_service(PM_REQUEST_KILL_APP, 0, pc,
                                NULL, data.pkgid, target_uid, NULL, NULL, &pid);
                        if (ret < 0) {
-                               data.result = PKGCMD_ERRCODE_ERROR;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                                break;
                        }
                        if (pid)
@@ -1023,7 +1024,7 @@ static int __process_request(uid_t target_uid)
                        ret = pkgmgr_client_usr_request_service(PM_REQUEST_CHECK_APP, 0, pc,
                                NULL, data.pkgid, target_uid, NULL, NULL, &pid);
                        if (ret < 0) {
-                               data.result = PKGCMD_ERRCODE_ERROR;
+                               data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                                break;
                        }
 
@@ -1082,7 +1083,7 @@ static int __process_request(uid_t target_uid)
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -1093,7 +1094,7 @@ static int __process_request(uid_t target_uid)
                ret = pkgmgr_client_usr_request_service(PM_REQUEST_GET_SIZE, data.type,
                                pc, NULL, data.pkgid, target_uid, NULL, NULL, NULL);
                if (ret < 0) {
-                       data.result = PKGCMD_ERRCODE_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERRCODE_ERROR;
                        break;
                }
 
@@ -1113,7 +1114,7 @@ static int __process_request(uid_t target_uid)
                pc = pkgmgr_client_new(PC_REQUEST);
                if (pc == NULL) {
                        printf("PkgMgr Client Creation Failed\n");
-                       data.result = PKGCMD_ERR_FATAL_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERR_FATAL_ERROR;
                        break;
                }
 
@@ -1123,7 +1124,7 @@ static int __process_request(uid_t target_uid)
                        ret = pkgmgr_client_get_package_size_info(pc, data.pkgid, __pkg_size_info_recv_cb, NULL);
 
                if (ret < 0) {
-                       data.result = PKGCMD_ERR_FATAL_ERROR;
+                       data.result = PKGMGR_INSTALLER_ERR_FATAL_ERROR;
                        break;
                }
 
@@ -1400,7 +1401,7 @@ int main(int argc, char *argv[])
        ret = __process_request(uid);
        if ((ret < 0) && (data.result == 0)) {
                printf("Undefined error(%d)", ret);
-               data.result = PKGCMD_ERRCODE_UNDEFINED_ERROR;
+               data.result = PKGMGR_INSTALLER_ERRCODE_UNDEFINED_ERROR;
        }
 
        if (ret != 0) {