From c21fd3083d21dec0d54dd642e779832f548f74a5 Mon Sep 17 00:00:00 2001 From: Damian Pietruchowski Date: Tue, 14 Mar 2017 09:22:34 +0100 Subject: [PATCH] Fix query IsHybridApplication() Recovery file naming rule is changed to: wgt-recovery-, so argument of find() function should be changed to "wgt-recovery-" for query is recovery request type. If #is_recovery is true it should not trying to unpack recovery file Change-Id: I37f9f31df602bab1a39702e6306082d8b10e2a03 Signed-off-by: Damian Pietruchowski --- src/wgt/wgt_app_query_interface.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc index 464165d..7b2eee4 100644 --- a/src/wgt/wgt_app_query_interface.cc +++ b/src/wgt/wgt_app_query_interface.cc @@ -102,7 +102,8 @@ bool WgtAppQueryInterface::IsPkgInstalled(const std::string& arg, uid_t uid) { bool WgtAppQueryInterface::IsHybridApplication(const std::string& arg, uid_t uid) { std::string info; - if (arg.find("apps_rw/recovery-") != std::string::npos) + bool is_recovery = arg.find("wgt-recovery-") != std::string::npos; + if (is_recovery) info = ReadPkgidFromRecovery(arg); else info = arg; @@ -112,7 +113,7 @@ bool WgtAppQueryInterface::IsHybridApplication(const std::string& arg, if (bf::exists(package_directory / info / kTizenManifestLocation) && bf::exists(package_directory / info / kHybridConfigLocation)) return true; - } else { + } else if (!is_recovery) { bool tizen_manifest_found = false; bool config_xml_found = false; if (!ci::CheckPathInZipArchive(info.c_str(), kTizenManifestLocation, -- 2.7.4