From: sung-su.kim Date: Wed, 3 Jul 2013 06:51:29 +0000 (+0900) Subject: [Release] wrt-installer_0.1.95 X-Git-Tag: submit/tizen_2.2/20130703.065523^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=746e54b0488b603d4a71144e96f89c5e57a363cd;p=platform%2Fframework%2Fweb%2Fwrt-installer.git [Release] wrt-installer_0.1.95 Change-Id: Ie7b95ce3e28dfe10bddda80a7940d18718b22677 --- diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 47eb82b..e69a5e1 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.94 +Version: 0.1.95 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt index cad802d..c1ce69d 100755 --- a/src/pkg-manager/CMakeLists.txt +++ b/src/pkg-manager/CMakeLists.txt @@ -21,7 +21,6 @@ SET(BACKLIB_SRCS ${PROJECT_SOURCE_DIR}/src/configuration_parser/ignoring_parser.cpp ${PROJECT_SOURCE_DIR}/src/configuration_parser/deny_all_parser.cpp ${PROJECT_SOURCE_DIR}/src/configuration_parser/libiriwrapper.cpp - ${PROJECT_SOURCE_DIR}/src/wrt-installer/language_subtag_rst_tree.cpp ) PKG_CHECK_MODULES(WRT_BACKLIB_PKGS @@ -34,7 +33,6 @@ PKG_CHECK_MODULES(WRT_BACKLIB_PKGS pkgmgr dlog libpcrecpp - libiri REQUIRED) INCLUDE_DIRECTORIES( diff --git a/src/pkg-manager/backendlib.cpp b/src/pkg-manager/backendlib.cpp index f783f8c..48f98d4 100644 --- a/src/pkg-manager/backendlib.cpp +++ b/src/pkg-manager/backendlib.cpp @@ -255,16 +255,6 @@ int getConfigParserData(const std::string &widgetPath, ConfigParserData& configI const char* CONFIG_XML = "config.xml"; const char* WITH_OSP_XML = "res/wgt/config.xml"; - try - { - WrtDB::WrtDatabase::attachToThreadRO(); - } - catch (const DPL::DB::SqlConnection::Exception::ConnectionBroken& ex) - { - LogError("Could not attach to DB: " << ex.GetMessage()); - return FALSE; - } - Try { ParserRunner parser; @@ -296,43 +286,35 @@ int getConfigParserData(const std::string &widgetPath, ConfigParserData& configI } Catch(DPL::ZipInput::Exception::OpenFailed) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to open widget package"); return FALSE; } Catch(DPL::ZipInput::Exception::OpenFileFailed) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to open config.xml file"); return FALSE; } Catch(DPL::CopyFailed) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to extract config.xml file"); return FALSE; } Catch(DPL::FileInput::Exception::OpenFailed) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to open config.xml file"); return FALSE; } Catch(ElementParser::Exception::ParseError) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to parse config.xml file"); return FALSE; } Catch(DPL::ZipInput::Exception::SeekFileFailed) { - WrtDB::WrtDatabase::detachFromThread(); LogError("Failed to seek widget archive - corrupted package?"); return FALSE; } - WrtDB::WrtDatabase::detachFromThread(); - return TRUE; }