diff options
| -rwxr-xr-x | inc/InstallerDefs.h | 2 | ||||
| -rwxr-xr-x | plugin/osp-installer-plugin.cpp | 8 | ||||
| -rwxr-xr-x | src/Manager/SignatureManager.cpp | 4 | ||||
| -rwxr-xr-x | src/Util/InstallerUtil.cpp | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index 45d1cd2..840253c 100755 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130508.1]" +#define OSP_INSTALLER_VERSION "version=[20130509.1]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/plugin/osp-installer-plugin.cpp b/plugin/osp-installer-plugin.cpp index 43210c9..d3e39d4 100755 --- a/plugin/osp-installer-plugin.cpp +++ b/plugin/osp-installer-plugin.cpp @@ -63,9 +63,9 @@ static int pkg_plugin_pkg_is_installed(const char *pkg_name) bool installed = true; AppLog("[libtpk] pkg_plugin_pkg_is_installed() is called"); - AppLog("[libtpk] pkg_name=[%s]", pkg_name); + AppLog("[libtpk] package=[%s]", pkg_name); - TryCatch(pkg_name, err = PKG_ERROR, "[osp-installer][libtpk] pkg_name is null"); + TryCatch(pkg_name, err = PKG_ERROR, "[osp-installer][libtpk] package is null"); if (packageName.Contains(PACKAGE_NAME_PREFIX_ORG) == true) { @@ -106,9 +106,9 @@ static int pkg_plugin_get_pkg_detail_info(const char *pkg_name, result r = E_SUCCESS; AppLog("[libtpk] pkg_plugin_get_pkg_detail_info() is called"); - AppLog("[libtpk] pkg_name=[%s]", pkg_name); + AppLog("[libtpk] package=[%s]", pkg_name); - TryCatch(pkg_name, err = PKG_ERROR, "[osp-installer][libtpk] pkg_name is null"); + TryCatch(pkg_name, err = PKG_ERROR, "[osp-installer][libtpk] package is null"); memset(pkg_detail_info, 0, sizeof(package_manager_pkg_detail_info_t)); diff --git a/src/Manager/SignatureManager.cpp b/src/Manager/SignatureManager.cpp index 2e5a4a4..c9e18ce 100755 --- a/src/Manager/SignatureManager.cpp +++ b/src/Manager/SignatureManager.cpp @@ -99,7 +99,7 @@ SignatureManager::ValidateSignatures() for (; iter != signatureFiles.rend(); ++iter) { int sigFileNumber = iter->getFileNumber(); - AppLog("SignatureFiles: name=[%s]", iter->getFileName().c_str()); + AppLog("SignatureFiles: file=[%s]", iter->getFileName().c_str()); AppLog("SignatureFiles: number=[%d]", sigFileNumber); ValidationCore::SignatureData data(rootPath + iter->getFileName(), iter->getFileNumber()); @@ -138,7 +138,7 @@ SignatureManager::ValidateSignatures() AppLog("validator.check() start >>"); valRes = validator.check(data, rootPath); TryReturn(valRes == ValidationCore::SignatureValidator::SIGNATURE_VERIFIED, false, "validator.check() is failed, valRes=[%d]", (int)valRes); - AppLog("Signature validator.check success, name=[%s], number=[%d]", iter->getFileName().c_str(), iter->getFileNumber()); + AppLog("Signature validator.check success, file=[%s], number=[%d]", iter->getFileName().c_str(), iter->getFileNumber()); ValidationCore::CertificatePtr pRootCert = data.getRootCaCertificatePtr(); TryReturn(pRootCert, false, "__pRootPath is null."); diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp index 4ab1f92..4c3f340 100755 --- a/src/Util/InstallerUtil.cpp +++ b/src/Util/InstallerUtil.cpp @@ -70,19 +70,19 @@ InstallerUtil::Remove(const Tizen::Base::String& filePath) if (S_ISLNK(fileinfo.st_mode)) { - AppLog("Remove(): symlink, path=[%s]", pFilePath.get()); + AppLog("Remove(): symlink=[%s]", pFilePath.get()); err = unlink(pFilePath.get()); - TryReturn(err >= 0, false, "unlink() failed(%s), filepath=[%s]", strerror(errno), pFilePath.get()); + TryReturn(err >= 0, false, "unlink() failed(%s), file=[%s]", strerror(errno), pFilePath.get()); } else if (S_ISDIR(fileinfo.st_mode)) { - AppLog("Remove(): directory, path=[%ls]", filePath.GetPointer()); + AppLog("Remove(): directory=[%ls]", filePath.GetPointer()); r = Directory::Remove(filePath, true); TryReturn(!IsFailed(r), false, "Directory::Remove() failed, filePath=%ls", filePath.GetPointer()); } else { - AppLog("Remove(): file, path=[%ls]", filePath.GetPointer()); + AppLog("Remove(): file=[%ls]", filePath.GetPointer()); r = File::Remove(filePath); TryReturn(!IsFailed(r), false, "File::Remove() failed, filePath=%ls", filePath.GetPointer()); } @@ -198,7 +198,7 @@ InstallerUtil::IsSymlink(const Tizen::Base::String& filePath) TryReturn(pFilePath, false, "pFilePath is null"); err = lstat(pFilePath.get(), &fileinfo); - TryReturn(err >= 0, false, "lstat() failed(%s), filepath=[%s]", strerror(errno), pFilePath.get()); + TryReturn(err >= 0, false, "lstat() failed(%s), file=[%s]", strerror(errno), pFilePath.get()); if (S_ISLNK(fileinfo.st_mode)) { @@ -267,7 +267,7 @@ InstallerUtil::ChangeMode(const String& filePath, int mode) TryReturn(pFilePath, false, "pFilePath is null"); err = chmod(pFilePath.get(), mode); - TryReturn(err == 0, false, "chmod() is failed(%s), filepath=[%s], mode=[%o]", strerror(errno), pFilePath.get(), mode); + TryReturn(err == 0, false, "chmod() is failed(%s), file=[%s], mode=[%o]", strerror(errno), pFilePath.get(), mode); return true; } @@ -281,7 +281,7 @@ InstallerUtil::ChangeOwner(const String& filePath) TryReturn(pFilePath, false, "pFilePath is null"); err = chown(pFilePath.get(), APP_OWNER_ID, APP_GROUP_ID); - TryReturn(err == 0, false, "chown() is failed(%s), filepath=[%s]", strerror(errno), pFilePath.get()); + TryReturn(err == 0, false, "chown() is failed(%s), file=[%s]", strerror(errno), pFilePath.get()); return true; } |