From: Jihoon Chung Date: Thu, 9 May 2013 08:50:56 +0000 (+0900) Subject: [Release] wrt-installer_0.1.55 X-Git-Tag: submit/tizen_2.1/20130514.055413~3 X-Git-Url: http://review.tizen.org/git/?p=framework%2Fweb%2Fwrt-installer.git;a=commitdiff_plain;h=c19ea14dd1a30364ab4357718647d98961743a96 [Release] wrt-installer_0.1.55 --- diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 34170e1..1a9cb33 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -1,7 +1,7 @@ -#git:framework/web/wrt-installer wrt-installer_0.1.54 +#git:framework/web/wrt-installer wrt-installer_0.1.55 Name: wrt-installer Summary: Installer for tizen Webruntime -Version: 0.1.54 +Version: 0.1.55 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 6433176..282c124 100644 --- a/src/configuration_parser/widget_parser.cpp +++ b/src/configuration_parser/widget_parser.cpp @@ -1352,7 +1352,7 @@ class ApplicationParser : public ElementParser }; const char* const ApplicationParser::REGEXP_PACKAGE = "[0-9A-Za-z]{10}"; -const char* const ApplicationParser::REGEXP_ID = "([0-9A-Za-z]{10})\\.[0-9A-Za-z]{2,52}"; +const char* const ApplicationParser::REGEXP_ID = "([0-9A-Za-z]{10})\\.[0-9A-Za-z]{1,52}"; const char* const ApplicationParser::REGEXP_VERSION = "\\d+\\.\\d+(\\.\\d+)?"; class SplashParser : public ElementParser diff --git a/src/jobs/widget_install/task_database.cpp b/src/jobs/widget_install/task_database.cpp index a7b405b..e9d1b6c 100644 --- a/src/jobs/widget_install/task_database.cpp +++ b/src/jobs/widget_install/task_database.cpp @@ -291,8 +291,12 @@ void TaskDatabase::StepAbortDBInsert() LogWarning("[DB Update Task] Aborting... (DB Clean)"); Try { - WidgetDAO::restoreUpdateWidget(m_backAppId, - m_context.widgetConfig.tzAppid); + if (m_context.isUpdateMode) { + WidgetDAO::restoreUpdateWidget(m_backAppId, + m_context.widgetConfig.tzAppid); + } else { + WidgetDAO::unregisterWidget(m_context.widgetConfig.tzAppid); + } LogDebug("Cleaning DB successful!"); } Catch(DPL::DB::SqlConnection::Exception::Base) diff --git a/src/jobs/widget_install/task_encrypt_resource.cpp b/src/jobs/widget_install/task_encrypt_resource.cpp index 647817e..0b47580 100644 --- a/src/jobs/widget_install/task_encrypt_resource.cpp +++ b/src/jobs/widget_install/task_encrypt_resource.cpp @@ -313,6 +313,10 @@ void TaskEncryptResource::EncryptFile(const std::string &fileName) "[" << DPL::GetErrnoString(error) << "]"); } const std::size_t fileSize = info.st_size; + if (0 == fileSize) { + LogDebug(fileName << " size is 0, so encryption is skiped"); + return; + } DPL::ScopedFClose inFile(openFile(fileName, "r")); DPL::ScopedFClose outFile(openFile(encFile, "w")); diff --git a/src/jobs/widget_install/task_file_manipulation.cpp b/src/jobs/widget_install/task_file_manipulation.cpp index b1629de..b365d9a 100644 --- a/src/jobs/widget_install/task_file_manipulation.cpp +++ b/src/jobs/widget_install/task_file_manipulation.cpp @@ -322,7 +322,10 @@ void TaskFileManipulation::StepAbortRenamePath() // Remove user data directory if preload web app. std::string userData = m_context.locations->getUserDataRootDir(); if (0 == access(userData.c_str(), F_OK)) { - WrtUtilRemove(userData); + if (!WrtUtilRemove(userData)) { + ThrowMsg(Exceptions::RemovingFolderFailure, + "Error occurs during removing user data directory"); + } } } diff --git a/src/jobs/widget_uninstall/task_remove_files.cpp b/src/jobs/widget_uninstall/task_remove_files.cpp old mode 100644 new mode 100755 diff --git a/src/misc/feature_logic.cpp b/src/misc/feature_logic.cpp index aa8b873..18b640b 100644 --- a/src/misc/feature_logic.cpp +++ b/src/misc/feature_logic.cpp @@ -79,8 +79,7 @@ void FeatureLogic::setAceResponse(bool allowed) Assert(isProcessable() && "Wrong usage"); if (!allowed) { m_currentFeature->rejected = true; - // TODO: checking tizen specification regarding security for insatlling - // m_rejected = true; + m_rejected = true; } } diff --git a/tests/general/widgets/app-control.wgt b/tests/general/widgets/app-control.wgt index 4aa5c7f..cc98093 100644 Binary files a/tests/general/widgets/app-control.wgt and b/tests/general/widgets/app-control.wgt differ diff --git a/tests/general/widgets/bg-00-with_bg.wgt b/tests/general/widgets/bg-00-with_bg.wgt index 6696e36..517a3e9 100644 Binary files a/tests/general/widgets/bg-00-with_bg.wgt and b/tests/general/widgets/bg-00-with_bg.wgt differ diff --git a/tests/general/widgets/bg-01-missing_file.wgt b/tests/general/widgets/bg-01-missing_file.wgt index 30ddb26..b14d665 100644 Binary files a/tests/general/widgets/bg-01-missing_file.wgt and b/tests/general/widgets/bg-01-missing_file.wgt differ diff --git a/tests/general/widgets/bg-02-without_bg.wgt b/tests/general/widgets/bg-02-without_bg.wgt index df388cd..ef45c95 100644 Binary files a/tests/general/widgets/bg-02-without_bg.wgt and b/tests/general/widgets/bg-02-without_bg.wgt differ diff --git a/tests/general/widgets/inst_nplug_1.wgt b/tests/general/widgets/inst_nplug_1.wgt index 934ac25..8447f91 100644 Binary files a/tests/general/widgets/inst_nplug_1.wgt and b/tests/general/widgets/inst_nplug_1.wgt differ diff --git a/tests/general/widgets/inst_nplug_2.wgt b/tests/general/widgets/inst_nplug_2.wgt index 96e7195..6bb6cff 100644 Binary files a/tests/general/widgets/inst_nplug_2.wgt and b/tests/general/widgets/inst_nplug_2.wgt differ diff --git a/tests/general/widgets/inst_nplug_3.wgt b/tests/general/widgets/inst_nplug_3.wgt index 39693c9..4b30743 100644 Binary files a/tests/general/widgets/inst_nplug_3.wgt and b/tests/general/widgets/inst_nplug_3.wgt differ diff --git a/tests/general/widgets/inst_nplug_4.wgt b/tests/general/widgets/inst_nplug_4.wgt index 78dcecc..a5ddecb 100644 Binary files a/tests/general/widgets/inst_nplug_4.wgt and b/tests/general/widgets/inst_nplug_4.wgt differ diff --git a/tests/general/widgets/tizen_app-control/config.xml b/tests/general/widgets/tizen_app-control/config.xml deleted file mode 100644 index b2aa6af..0000000 --- a/tests/general/widgets/tizen_app-control/config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - app-control - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/general/widgets/tizen_app-control/icon.png b/tests/general/widgets/tizen_app-control/icon.png deleted file mode 100755 index b835ed1..0000000 Binary files a/tests/general/widgets/tizen_app-control/icon.png and /dev/null differ diff --git a/tests/general/widgets/tizen_app-control/index.htm b/tests/general/widgets/tizen_app-control/index.htm deleted file mode 100755 index 5e7036c..0000000 --- a/tests/general/widgets/tizen_app-control/index.htm +++ /dev/null @@ -1,8 +0,0 @@ - - - Disposition attribute - - -

Check database.

- -