Sync to the latest code

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

diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec
index f46a038..39705f7 100755 (executable)
--- a/packaging/pkgmgr-info.spec
+++ b/packaging/pkgmgr-info.spec
@@ -1,6 +1,6 @@
 Name:       pkgmgr-info
 Summary:    Packager Manager infomation api for package
-Version:    0.0.134
+Version:    0.0.135
 Release:    1
 Group:      Application Framework/Package Management
 License:    Apache-2.0

diff --git a/parser/pkgmgr_parser.c b/parser/pkgmgr_parser.c
index 7f875d0..986d8d6 100755 (executable)
--- a/parser/pkgmgr_parser.c
+++ b/parser/pkgmgr_parser.c
@@ -1105,8 +1105,8 @@ __streamFile(const char *filename, ACTION_TYPE action, char *const tagv[], const
        int ret;
        char *tag_list[PKG_TAG_LEN_MAX] = {'\0'};
 
-       __plugin_find_tag(filename, tagv, tag_list);
-       __plugin_process_tag(tag_list, action, PLUGIN_PRE_PROCESS, pkgid);
+//     __plugin_find_tag(filename, tagv, tag_list);
+       __plugin_process_tag(tagv, action, PLUGIN_PRE_PROCESS, pkgid);
 
        docPtr = xmlReadFile(filename, NULL, 0);
        reader = xmlReaderWalker(docPtr);
@@ -1125,7 +1125,7 @@ __streamFile(const char *filename, ACTION_TYPE action, char *const tagv[], const
                DBGE("Unable to open %s", filename);
        }
 
-       __plugin_process_tag(tag_list, action, PLUGIN_POST_PROCESS, pkgid);
+       __plugin_process_tag(tagv, action, PLUGIN_POST_PROCESS, pkgid);
 }
 
 static int __next_child_element(xmlTextReaderPtr reader, int depth)

diff --git a/src/pkgmgr-info.c b/src/pkgmgr-info.c
index 0883a71..08a38e7 100755 (executable)
--- a/src/pkgmgr-info.c
+++ b/src/pkgmgr-info.c
@@ -3847,7 +3847,7 @@ API int pkgmgrinfo_appinfo_get_list(pkgmgrinfo_pkginfo_h handle, pkgmgrinfo_app_
 
        /*get system locale*/
        syslocale = vconf_get_str(VCONFKEY_LANGSET);
-       tryvm_if(syslocale == NULL, ret = PMINFO_R_EINVAL, "current locale is NULL");
+       retvm_if(syslocale == NULL, PMINFO_R_EINVAL, "current locale is NULL");
 
        /*get locale on db*/
        locale = __convert_system_locale_to_manifest_locale(syslocale);
@@ -3875,7 +3875,7 @@ API int pkgmgrinfo_appinfo_get_list(pkgmgrinfo_pkginfo_h handle, pkgmgrinfo_app_
 
        /*open db */
        ret = db_util_open_with_options(MANIFEST_DB, &appinfo_db, SQLITE_OPEN_READONLY, NULL);
-       retvm_if(ret != SQLITE_OK, ret = PMINFO_R_ERROR, "connect db [%s] failed!", MANIFEST_DB);
+       tryvm_if(ret != SQLITE_OK, ret = PMINFO_R_ERROR, "connect db [%s] failed!", MANIFEST_DB);
 
        appinfo->package = strdup(info->manifest_info->package);
        snprintf(query, MAX_QUERY_LEN, "select DISTINCT * " \