diff --git a/adapter/ohos/HapVerify.java b/adapter/ohos/HapVerify.java index 7f01fac979fc005602b81c2aaefaf44b6d07cfd1..e462b4baa86834ff59482448971b7f961579de29 100644 --- a/adapter/ohos/HapVerify.java +++ b/adapter/ohos/HapVerify.java @@ -464,18 +464,18 @@ class HapVerify { !checkDuplicatedIsValid(hapVerifyInfos.get(i), hapVerifyInfos.get(j))) { String cause = "Module: (" + hapVerifyInfos.get(i).getModuleName() + ") and Module: (" + hapVerifyInfos.get(j).getModuleName() + ") have the same moduleName, " + - "please check deviceType or distroFilter of the module.\n" + "Module: " + + "please check deviceType or distroFilter/distributionFilter of the module.\n" + "Module: " + hapVerifyInfos.get(i).getModuleName() + " has deviceType " + hapVerifyInfos.get(i).getDeviceType() + ".\n" + "Another Module: " + hapVerifyInfos.get(j).getModuleName() + " has deviceType " + hapVerifyInfos.get(j).getDeviceType() + "."; if (!EMPTY_STRING.equals(hapVerifyInfos.get(i).getDistroFilter().dump())) { - cause += "\n" + "Module: " + hapVerifyInfos.get(i).getModuleName() + " DistroFilter is " + + cause += "\n" + "Module: " + hapVerifyInfos.get(i).getModuleName() + " DistroFilter/DistributionFilter is " + hapVerifyInfos.get(i).getDistroFilter().dump() + "."; } if (!EMPTY_STRING.equals(hapVerifyInfos.get(j).getDistroFilter().dump())) { cause += "\n" + "Another Module: " + hapVerifyInfos.get(j).getModuleName() + - " DistroFilter is " + hapVerifyInfos.get(j).getDistroFilter().dump() + "."; + " DistroFilter/DistributionFilter is " + hapVerifyInfos.get(j).getDistroFilter().dump() + "."; } String solution = "Make sure the module name is valid and unique.\n" + "Reference: " + REFERENCE_LINK + "."; diff --git a/packing_tool/frameworks/src/json/hap_verify_utils.cpp b/packing_tool/frameworks/src/json/hap_verify_utils.cpp index 0896f59ba1fcc312ac9c57e0cafda9c54894cc8b..743c457138a52a085a89414a00be28cbf1a38e51 100644 --- a/packing_tool/frameworks/src/json/hap_verify_utils.cpp +++ b/packing_tool/frameworks/src/json/hap_verify_utils.cpp @@ -279,18 +279,19 @@ bool HapVerifyUtils::IsEntryOrFeature(const std::string& moduleType) void HapVerifyUtils::ShowCheckTips(const HapVerifyInfo& hapVerifyInfo1, const HapVerifyInfo& hapVerifyInfo2, const std::string& tip) { - LOGE("Module: (%s) and Module: (%s) have the same %s, please check deviceType or distroFilter of the module.", + LOGE("Module: (%s) and Module: (%s) have the same %s, " + "please check deviceType or distroFilter/distributionFilter of the module.", hapVerifyInfo1.GetModuleName().c_str(), hapVerifyInfo2.GetModuleName().c_str(), tip.c_str()); LOGE("Module: %s has deviceType %s.", hapVerifyInfo1.GetModuleName().c_str(), Utils::ListToString(hapVerifyInfo1.GetDeviceTypes()).c_str()); LOGE("Another Module: %s has deviceType %s.", hapVerifyInfo2.GetModuleName().c_str(), Utils::ListToString(hapVerifyInfo2.GetDeviceTypes()).c_str()); if (hapVerifyInfo1.GetDistroFilter().Dump() != EMPTY_STRING) { - LOGE("Module: %s DistroFilter is : %s.", hapVerifyInfo1.GetModuleName().c_str(), + LOGE("Module: %s DistroFilter/DistributionFilter is : %s.", hapVerifyInfo1.GetModuleName().c_str(), hapVerifyInfo1.GetDistroFilter().Dump().c_str()); } if (hapVerifyInfo2.GetDistroFilter().Dump() != EMPTY_STRING) { - LOGE("Another Module: %s DistroFilter is %s.", hapVerifyInfo2.GetModuleName().c_str(), + LOGE("Another Module: %s DistroFilter/DistributionFilter is %s.", hapVerifyInfo2.GetModuleName().c_str(), hapVerifyInfo2.GetDistroFilter().Dump().c_str()); } LOGE("Solution: Make sure the %s is valid and unique.", tip.c_str()); diff --git a/packing_tool/frameworks/src/json/module_json.cpp b/packing_tool/frameworks/src/json/module_json.cpp index f08ac2971661513df06f0e42499c7597cf5a8f19..c9d7bce8f302cb978909cb1470e37fc5cd20c052 100644 --- a/packing_tool/frameworks/src/json/module_json.cpp +++ b/packing_tool/frameworks/src/json/module_json.cpp @@ -573,7 +573,7 @@ bool ModuleJson::ParseModuleMetadatasToDistroFilter(const std::list distroFilterObj; if (distroFilterJsonObj->Contains(DISTRIBUTION_FILTER.c_str())) { if (distroFilterJsonObj->GetObject(DISTRIBUTION_FILTER.c_str(), &distroFilterObj) != Result::SUCCESS) { - LOGE("DistroFilter node get %s failed!", DISTRO_FILTER.c_str()); + LOGE("DistroFilter node get %s failed!", DISTRIBUTION_FILTER.c_str()); return false; } } else if (distroFilterJsonObj->Contains(DISTRO_FILTER.c_str())) {