From b2727c090a553e0a69fc8aa4c0a24471ae846c27 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Thu, 13 Jun 2013 14:02:12 +0900 Subject: [PATCH] Fixed hybrid web app update [Issue#] N/A [Problem] can't update hybrid web app. [Cause] failed update manifest file. [Solution] update manifest file. [SCMRequest] N/A Change-Id: I6f58c91a7171771b240c571f793f4565cded2a3b --- src/jobs/widget_install/task_manifest_file.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp index 599358f..8a7e3f3 100755 --- a/src/jobs/widget_install/task_manifest_file.cpp +++ b/src/jobs/widget_install/task_manifest_file.cpp @@ -585,7 +585,6 @@ void TaskManifestFile::stepGenerateManifest() void TaskManifestFile::stepParseManifest() { int code = 0; - char* updateTags[3] = {NULL, }; if (!m_context.mode.removable) { @@ -595,8 +594,9 @@ void TaskManifestFile::stepParseManifest() } + commitManifest(); + if (!m_context.isUpdateMode) { - commitManifest(); code = pkgmgr_parser_parse_manifest_for_installation( commit_manifest.c_str(), (updateTags[0] == NULL) ? NULL : updateTags); @@ -605,18 +605,12 @@ void TaskManifestFile::stepParseManifest() ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code); } } else { - if (m_context.widgetConfig.packagingType != - PKG_TYPE_HYBRID_WEB_APP) - { - commitManifest(); - code = pkgmgr_parser_parse_manifest_for_upgrade( - commit_manifest.c_str(), (updateTags[0] == NULL) ? NULL : updateTags); - - if (code != 0) { - LogError("Manifest parser error: " << code); - ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code); - } + code = pkgmgr_parser_parse_manifest_for_upgrade( + commit_manifest.c_str(), (updateTags[0] == NULL) ? NULL : updateTags); + if (code != 0) { + LogError("Manifest parser error: " << code); + ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code); } } -- 2.7.4