[Release] wrt-installer_0.1.41

Merge branch 'master' into tizen_2.1

Change-Id: I7d4e2bc572886738d254c5dff48ee191f6ac143e

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index 2976c26..f0815c0 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -1,7 +1,7 @@
-#git:framework/web/wrt-installer wrt-installer 0.1.40
+#git:framework/web/wrt-installer wrt-installer 0.1.41
 Name:       wrt-installer
 Summary:    Installer for tizen Webruntime
-Version:    0.1.40
+Version:    0.1.41
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/jobs/plugin_install/plugin_install_task.cpp b/src/jobs/plugin_install/plugin_install_task.cpp
index 4c87f62..65333ba 100644 (file)
--- a/src/jobs/plugin_install/plugin_install_task.cpp
+++ b/src/jobs/plugin_install/plugin_install_task.cpp
@@ -187,9 +187,10 @@ void PluginInstallTask::stepLoadPluginLibrary()
 
     void *dlHandle = dlopen(filename.c_str(), RTLD_LAZY);
     if (dlHandle == NULL) {
+        const char* error = (const char*)dlerror();
         LogError(
             "Failed to load plugin: " << filename <<
-            ". Reason: " << (dlerror() != NULL ? dlerror() : "unknown"));
+            ". Reason: " << (error != NULL ? error : "unknown"));
         ThrowMsg(Exceptions::PluginLibraryError, "Library error");
     }
 

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index e2b2086..d733180 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -162,8 +162,6 @@ JobWidgetInstall::JobWidgetInstall(
     JobContextBase<WidgetInstallationStruct>(installerStruct),
     m_exceptionCaught(Jobs::Exceptions::Success)
 {
-    m_installerContext.m_quiet = m_jobStruct.m_quiet;
-
     ConfigureResult result = PrePareInstallation(widgetPath);
 
     if (result == ConfigureResult::Ok) {

diff --git a/src/jobs/widget_install/task_certify.cpp b/src/jobs/widget_install/task_certify.cpp
index 626cf18..128f022 100644 (file)
--- a/src/jobs/widget_install/task_certify.cpp
+++ b/src/jobs/widget_install/task_certify.cpp
@@ -50,6 +50,7 @@ using namespace ValidationCore;
 using namespace WrtDB;
 
 namespace {
+
 WidgetCertificateData toWidgetCertificateData(const SignatureData &data,
                                               bool root)
 {

diff --git a/src/jobs/widget_install/widget_install_context.h b/src/jobs/widget_install/widget_install_context.h
index 7d3eec2..bd96390 100644 (file)
--- a/src/jobs/widget_install/widget_install_context.h
+++ b/src/jobs/widget_install/widget_install_context.h
@@ -98,7 +98,6 @@ struct InstallerContext
      * case with SMACK). */
     RequestedDevCapsMap staticPermittedDevCaps;
     std::string installInfo;            ///<For recovery>
-    bool m_quiet;
     InstallLocationType locationType;
     bool isUpdateMode;
 };

diff --git a/src/jobs/widget_install/widget_installer_struct.h b/src/jobs/widget_install/widget_installer_struct.h
index 2321a62..0ebe48a 100644 (file)
--- a/src/jobs/widget_install/widget_installer_struct.h
+++ b/src/jobs/widget_install/widget_installer_struct.h
@@ -66,13 +66,11 @@ WidgetInstallCallbackBase;
 struct WidgetInstallationStruct : public WidgetInstallCallbackBase
 {
     InstallMode::Type m_installMode;
-    bool m_quiet;
     std::shared_ptr<PackageManager::IPkgmgrSignal> pkgmgrInterface;
 
     // It must be empty-constructible as a parameter of generic event
     WidgetInstallationStruct() :
-        m_installMode(InstallMode::Type::INSTALL_MODE_WGT),
-        m_quiet(true)
+        m_installMode(InstallMode::Type::INSTALL_MODE_WGT)
     {}
 
     WidgetInstallationStruct(
@@ -80,13 +78,11 @@ struct WidgetInstallationStruct : public WidgetInstallCallbackBase
         InstallerProgressCallback progress,
         void *param,
         InstallMode::Type mode,
-        bool quiet,
         std::shared_ptr<PackageManager::IPkgmgrSignal>
         _pkgmgrInterface
         ) :
         WidgetInstallCallbackBase(finished, progress, param),
         m_installMode(mode),
-        m_quiet(quiet),
         pkgmgrInterface(_pkgmgrInterface)
     {}
 };

diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index a0efdbb..c1ce69d 100755 (executable)
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -32,6 +32,7 @@ PKG_CHECK_MODULES(WRT_BACKLIB_PKGS
     pkgmgr-types
     pkgmgr
     dlog
+    libpcrecpp
     REQUIRED)
 
 INCLUDE_DIRECTORIES(

diff --git a/src/pkg-manager/pkgmgr_signal.cpp b/src/pkg-manager/pkgmgr_signal.cpp
index b4a8e3e..5f43314 100644 (file)
--- a/src/pkg-manager/pkgmgr_signal.cpp
+++ b/src/pkg-manager/pkgmgr_signal.cpp
@@ -27,7 +27,6 @@ namespace PackageManager {
 PkgmgrSignal::PkgmgrSignal() :
     m_initialized(false),
     m_handle(NULL),
-    m_noPopup(false),
     m_reqType(PKGMGR_REQ_INVALID)
 {}
 
@@ -52,7 +51,6 @@ bool PkgmgrSignal::initialize(int argc, char* argv[])
     if (!pkgmgr_installer_receive_request(
             m_handle, argc, argv))
     {
-        m_noPopup = pkgmgr_installer_is_quiet(m_handle);
         m_reqType = pkgmgr_installer_get_request_type(m_handle);
         if (m_reqType != PKGMGR_REQ_INSTALL &&
             m_reqType != PKGMGR_REQ_UNINSTALL &&
@@ -155,13 +153,4 @@ int PkgmgrSignal::getRequestedType() const
 
     return m_reqType;
 }
-
-bool PkgmgrSignal::isNoPopupRequired() const
-{
-    if (!m_initialized) {
-        LogError("PkgmgrSingal not yet intialized");
-    }
-
-    return m_noPopup;
-}
 } // PackageManager

diff --git a/src/pkg-manager/pkgmgr_signal.h b/src/pkg-manager/pkgmgr_signal.h
index eef6ae5..2e7f7c9 100644 (file)
--- a/src/pkg-manager/pkgmgr_signal.h
+++ b/src/pkg-manager/pkgmgr_signal.h
@@ -50,7 +50,6 @@ class PkgmgrSignal : public IPkgmgrSignal
     bool sendSignal(const std::string& key, const std::string& value) const;
     std::string getPkgname() const;
     int getRequestedType() const;
-    bool isNoPopupRequired() const;
 
     PkgmgrSignal();
     virtual ~PkgmgrSignal();
@@ -60,7 +59,6 @@ class PkgmgrSignal : public IPkgmgrSignal
     PkgmgrHandle m_handle;
     std::string m_type;
     std::string m_pkgname;
-    bool m_noPopup;
     int m_reqType;
 };
 } // PackageManager

diff --git a/src/wrt-installer/wrt-installer.cpp b/src/wrt-installer/wrt-installer.cpp
index 7d2cb52..a61a96a 100644 (file)
--- a/src/wrt-installer/wrt-installer.cpp
+++ b/src/wrt-installer/wrt-installer.cpp
@@ -89,7 +89,6 @@ WrtInstaller::WrtInstaller(int argc, char **argv) :
     m_totalPlugins(0),
     m_returnStatus(-1),
     m_installByPkgmgr(false),
-    m_quiet(true),
     m_startupPluginInstallation(false)
 {
     Touch();
@@ -265,8 +264,6 @@ void WrtInstaller::OnCreate()
                 );
 
         pkgmgrSignal->initialize(m_argc, m_argv);
-        m_quiet = pkgmgrSignal->isNoPopupRequired();
-        LogDebug("backend m_quiet" << m_quiet);
 
         int reqType = pkgmgrSignal->getRequestedType();
 
@@ -404,10 +401,9 @@ void WrtInstaller::installStep()
 
     wrt_install_widget(packagePath ? packagePath.get() : m_packagePath.c_str(),
                        this, &staticWrtStatusCallback,
-                       (!m_quiet || m_installByPkgmgr)
+                       (m_installByPkgmgr)
                        ? &staticWrtInstallProgressCallback : NULL,
                        m_installMode,
-                       m_quiet,
                        pkgmgrSignalInterface);
 }
 
@@ -497,7 +493,7 @@ void WrtInstaller::uninstallPkgNameStep()
     LogDebug("Uninstalling widget ...");
     LogDebug("Package name : " << m_name);
     wrt_uninstall_widget(m_name.c_str(), this, &staticWrtStatusCallback,
-                         (!m_quiet || m_installByPkgmgr)
+                         (m_installByPkgmgr)
                          ? &staticWrtUninstallProgressCallback : NULL,
                          pkgmgrSignalInterface);
 }
@@ -542,7 +538,7 @@ void WrtInstaller::unistallWgtFileStep()
             LogDebug("Pkgid from packagePath : " << pkgId);
             wrt_uninstall_widget(
                 DPL::ToUTF8String(*pkgId).c_str(), this, &staticWrtStatusCallback,
-                !m_quiet ? &staticWrtUninstallProgressCallback
+                !m_installByPkgmgr ? &staticWrtUninstallProgressCallback
                 : NULL,
                 pkgmgrSignalInterface);
         } else {

diff --git a/src/wrt-installer/wrt-installer.h b/src/wrt-installer/wrt-installer.h
index b2288e3..da75d42 100644 (file)
--- a/src/wrt-installer/wrt-installer.h
+++ b/src/wrt-installer/wrt-installer.h
@@ -130,7 +130,6 @@ class WrtInstaller :
     size_t m_totalPlugins;
     int m_returnStatus;
     bool m_installByPkgmgr;
-    bool m_quiet;
     bool m_startupPluginInstallation;
     CSCConfiguration::dataMap m_CSCconfigurationMap;
 

diff --git a/src/wrt-installer/wrt_installer_api.cpp b/src/wrt-installer/wrt_installer_api.cpp
index 1f7c4a4..bb84730 100644 (file)
--- a/src/wrt-installer/wrt_installer_api.cpp
+++ b/src/wrt-installer/wrt_installer_api.cpp
@@ -195,7 +195,6 @@ EXPORT_API void wrt_install_widget(
     WrtInstallerStatusCallback status_cb,
     WrtProgressCallback progress_cb,
     WrtInstallMode installMode,
-    bool quiet,
     std::shared_ptr<PackageManager::
                         IPkgmgrSignal> pkgmgrInterface
     )
@@ -220,7 +219,6 @@ EXPORT_API void wrt_install_widget(
                     new InstallerCallbacksTranslate::StatusCallbackStruct(
                         userdata, status_cb, progress_cb),
                     translateInstallMode(installMode),
-                    quiet,
                     pkgmgrInterface)));
     }
     UNHANDLED_EXCEPTION_HANDLER_END

diff --git a/src/wrt-installer/wrt_installer_api.h b/src/wrt-installer/wrt_installer_api.h
index bb4ff8d..512168b 100644 (file)
--- a/src/wrt-installer/wrt_installer_api.h
+++ b/src/wrt-installer/wrt_installer_api.h
@@ -64,7 +64,6 @@ void wrt_install_widget(
     WrtInstallerStatusCallback status_callback,
     WrtProgressCallback progress_callback,
     WrtInstallMode install_mode,
-    bool quiet,
     std::shared_ptr<PackageManager::IPkgmgrSignal>
     pkgmgrInterface
     );