diff --git a/services/bundlemgr/include/shared/inner_shared_bundle_installer.h b/services/bundlemgr/include/shared/inner_shared_bundle_installer.h index e78584ca2d8c414dcd203f1c41c817b88b9d33b4..8080e9375c154534c0607866cbb3d7ce2e21f687 100644 --- a/services/bundlemgr/include/shared/inner_shared_bundle_installer.h +++ b/services/bundlemgr/include/shared/inner_shared_bundle_installer.h @@ -97,7 +97,6 @@ private: const std::string &moduleName, const std::string &realHspPath, const std::string &versionDir); std::string ObtainTempSoPath(const std::string &moduleName, const std::string &nativeLibPath); - // the real path or the parent directory of hsp files to be installed. std::string sharedBundlePath_; std::string bundleName_; diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 3d36277cfda4394a0d616bc712ae72364c73337c..e772c9b49b13217089b3b387117f131214f9e505 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -3885,8 +3885,8 @@ ErrCode BaseBundleInstaller::MoveSoFileToRealInstallationDir( .append(nativeLibraryPath_); std::string realSoDir; realSoDir.append(Constants::BUNDLE_CODE_DIR).append(Constants::PATH_SEPARATOR) - .append(info.second.GetBundleName()).append(Constants::PATH_SEPARATOR) - .append(nativeLibraryPath_); + .append(info.second.GetBundleName()).append(Constants::PATH_SEPARATOR) + .append(nativeLibraryPath_); APP_LOGD("move so file from path %{public}s to path %{public}s", tempSoDir.c_str(), realSoDir.c_str()); bool isDirExisted = false; auto result = InstalldClient::GetInstance()->IsExistDir(realSoDir, isDirExisted); diff --git a/services/bundlemgr/src/bundle_install_checker.cpp b/services/bundlemgr/src/bundle_install_checker.cpp index befbf0708edc49f53a30bc024d632466ddbe0eb2..37028e9db18d8331e0fb9dfc36748ce3da024425 100644 --- a/services/bundlemgr/src/bundle_install_checker.cpp +++ b/services/bundlemgr/src/bundle_install_checker.cpp @@ -240,10 +240,10 @@ ErrCode BundleInstallChecker::CheckMultipleHapsSignInfo( bool BundleInstallChecker::VaildInstallPermission(const InstallParam &installParam, const std::vector &hapVerifyRes) { - PermissionStatus installBundlestatus = installParam.installBundlePermissionStatus; + PermissionStatus installBundleStatus = installParam.installBundlePermissionStatus; PermissionStatus installEnterpriseBundleStatus = installParam.installEnterpriseBundlePermissionStatus; bool isCallByShell = installParam.isCallByShell; - if (!isCallByShell && installBundlestatus == PermissionStatus::HAVE_PERMISSION_STATUS && + if (!isCallByShell && installBundleStatus == PermissionStatus::HAVE_PERMISSION_STATUS && installEnterpriseBundleStatus == PermissionStatus::HAVE_PERMISSION_STATUS) { return true; } @@ -251,14 +251,14 @@ bool BundleInstallChecker::VaildInstallPermission(const InstallParam &installPar Security::Verify::ProvisionInfo provisionInfo = hapVerifyRes[i].GetProvisionInfo(); if (provisionInfo.distributionType == Security::Verify::AppDistType::ENTERPRISE) { if (isCallByShell && provisionInfo.type != Security::Verify::ProvisionType::DEBUG) { - APP_LOGE("install enterprise bundle permission denied"); + APP_LOGE("bm install enterprise bundle permission denied"); return false; } if (!isCallByShell && installEnterpriseBundleStatus != PermissionStatus::HAVE_PERMISSION_STATUS) { APP_LOGE("install enterprise bundle permission denied"); return false; } - } else if (installBundlestatus != PermissionStatus::HAVE_PERMISSION_STATUS) { + } else if (installBundleStatus != PermissionStatus::HAVE_PERMISSION_STATUS) { APP_LOGE("install permission denied"); return false; } @@ -356,10 +356,10 @@ ErrCode BundleInstallChecker::ParseHapFiles( bool BundleInstallChecker::VaildInstallPermissionForShare(const InstallCheckParam &checkParam, const std::vector &hapVerifyRes) { - PermissionStatus installBundlestatus = checkParam.installBundlePermissionStatus; + PermissionStatus installBundleStatus = checkParam.installBundlePermissionStatus; PermissionStatus installEnterpriseBundleStatus = checkParam.installEnterpriseBundlePermissionStatus; bool isCallByShell = checkParam.isCallByShell; - if (!isCallByShell && installBundlestatus == PermissionStatus::HAVE_PERMISSION_STATUS && + if (!isCallByShell && installBundleStatus == PermissionStatus::HAVE_PERMISSION_STATUS && installEnterpriseBundleStatus == PermissionStatus::HAVE_PERMISSION_STATUS) { return true; } @@ -367,14 +367,14 @@ bool BundleInstallChecker::VaildInstallPermissionForShare(const InstallCheckPara Security::Verify::ProvisionInfo provisionInfo = hapVerifyRes[i].GetProvisionInfo(); if (provisionInfo.distributionType == Security::Verify::AppDistType::ENTERPRISE) { if (isCallByShell && provisionInfo.type != Security::Verify::ProvisionType::DEBUG) { - APP_LOGE("install enterprise bundle permission denied"); + APP_LOGE("bm install enterprise bundle permission denied"); return false; } if (!isCallByShell && installEnterpriseBundleStatus != PermissionStatus::HAVE_PERMISSION_STATUS) { APP_LOGE("install enterprise bundle permission denied"); return false; } - } else if (installBundlestatus != PermissionStatus::HAVE_PERMISSION_STATUS) { + } else if (installBundleStatus != PermissionStatus::HAVE_PERMISSION_STATUS) { APP_LOGE("install permission denied"); return false; }