From 9b523061494b02e176fb873bd01622c37c6f8687 Mon Sep 17 00:00:00 2001 From: "sung-su.kim" Date: Mon, 15 Jul 2013 22:04:25 +0900 Subject: [PATCH] [Release] wrt-installer_0.1.101 Change-Id: I045a64ae245d5e7baa2fe900b87ce8881d5ae186 --- CMakeLists.txt | 2 +- packaging/wrt-installer.spec | 2 +- src/configuration_parser/widget_parser.cpp | 11 ++--------- src/jobs/widget_install/widget_unzip.cpp | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 666256f..23b1a5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,9 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2 -g") SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -std=c++0x -g") SET(CMAKE_CXX_FLAGS_CCOV "-O0 -std=c++0x -g --coverage") + ADD_DEFINITIONS("-DDPL_LOGS_ENABLED") IF(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling") MESSAGE(STATUS "Logging enabled for DPL") - ADD_DEFINITIONS("-DDPL_LOGS_ENABLED") ELSE(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling") MESSAGE(STATUS "Logging disabled for DPL") ENDIF(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling") diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 760490a..40164fd 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -1,7 +1,7 @@ #git:framework/web/wrt-installer Name: wrt-installer Summary: Installer for tizen Webruntime -Version: 0.1.99 +Version: 0.1.101 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/configuration_parser/widget_parser.cpp b/src/configuration_parser/widget_parser.cpp index c002eb1..5fe45e4 100644 --- a/src/configuration_parser/widget_parser.cpp +++ b/src/configuration_parser/widget_parser.cpp @@ -2840,15 +2840,8 @@ void WidgetParser::Accept(const XmlAttribute& attribute) if (!m_defaultlocale) { m_defaultlocale = attribute.value; NormalizeString(m_defaultlocale); - if (!LanguageSubtagRstTreeSingleton::Instance().ValidateLanguageTag( - DPL::ToUTF8String(*m_defaultlocale))) - { - LogWarning("Language tag: " << - m_defaultlocale << " is not valid"); - m_defaultlocale = DPL::OptionalString::Null; - } else { - LogDebug("Default Locale Found " << m_defaultlocale); - } + /* TODO : should check valid defaultlocale */ + LogDebug("Default Locale Found " << m_defaultlocale); } else { LogWarning("Ignoring subsequent default locale"); } diff --git a/src/jobs/widget_install/widget_unzip.cpp b/src/jobs/widget_install/widget_unzip.cpp index 5605ec2..95f3ab4 100644 --- a/src/jobs/widget_install/widget_unzip.cpp +++ b/src/jobs/widget_install/widget_unzip.cpp @@ -231,7 +231,7 @@ std::string WidgetUnzip::getDecryptedPackage(const std::string &source) } LogDebug("decrypted file name : " << decryptedFile); - if (decryptDRMPackage(source, decryptedFile)) { + if (!decryptDRMPackage(source, decryptedFile)) { LogError("Failed decrypt drm file"); ThrowMsg(Exceptions::DrmDecryptFailed, source); } -- 2.7.4