Revert "Add to pass rivilege level when installing service app."

Commit is not tested.
And commit message is wrong.

This reverts commit ab85306f76669ef4f8b29a959360bff28e5e100f.

Change-Id: I34e5471cc3b76bab7f7369b932fb55487d0b5caa

diff --git a/src/jobs/widget_install/task_certify_level.cpp b/src/jobs/widget_install/task_certify_level.cpp
index fd696e0..c1372f4 100644 (file)
--- a/src/jobs/widget_install/task_certify_level.cpp
+++ b/src/jobs/widget_install/task_certify_level.cpp
@@ -166,7 +166,6 @@ TaskCertifyLevel::Level TaskCertifyLevel::getCertifyLevel()
         }
     }
 
-    m_contextData.certLevel = level;
     return level;
 }
 

diff --git a/src/jobs/widget_install/task_certify_level.h b/src/jobs/widget_install/task_certify_level.h
index ad8d427..ddad9e9 100644 (file)
--- a/src/jobs/widget_install/task_certify_level.h
+++ b/src/jobs/widget_install/task_certify_level.h
@@ -46,7 +46,7 @@ class TaskCertifyLevel :
     //data
     InstallerContext& m_contextData;
 
-    enum Level {
+    enum class Level : std::int8_t {
         UNKNOWN  = 0,
         PUBLIC   = 1,
         PARTNER  = 2,

diff --git a/src/jobs/widget_install/task_install_ospsvc.cpp b/src/jobs/widget_install/task_install_ospsvc.cpp
index 15923f9..96d0dae 100644 (file)
--- a/src/jobs/widget_install/task_install_ospsvc.cpp
+++ b/src/jobs/widget_install/task_install_ospsvc.cpp
@@ -42,8 +42,7 @@ using namespace WrtDB;
 
 namespace {
 const int MAX_BUF_SIZE = 128;
-const char* OSP_INSTALL_STR1 = "/usr/etc/package-manager/backend/tpk -iv ";
-const char* OSP_INSTALL_STR2 = " -p ";
+const char* OSP_INSTALL_STR = "/usr/etc/package-manager/backend/tpk -iv ";
 }
 
 namespace Jobs {
@@ -62,9 +61,9 @@ void TaskInstallOspsvc::StepInstallOspService()
     _D("Step: installation for osp service");
 
     std::ostringstream commStr;
-    commStr << OSP_INSTALL_STR1<< BashUtils::escape_arg(
-        m_context.locations->getPackageInstallationDir())
-        << OSP_INSTALL_STR2 << m_context.certLevel;
+    commStr << OSP_INSTALL_STR << BashUtils::escape_arg(
+        m_context.locations->getPackageInstallationDir());
+    //commStr << " 2>&1";
     _D("osp install command : %s", commStr.str().c_str());
 
     char readBuf[MAX_BUF_SIZE];

diff --git a/src/jobs/widget_install/widget_install_context.h b/src/jobs/widget_install/widget_install_context.h
index 5750cbd..4816e94 100644 (file)
--- a/src/jobs/widget_install/widget_install_context.h
+++ b/src/jobs/widget_install/widget_install_context.h
@@ -101,7 +101,6 @@ struct InstallerContext
 
     std::string requestedPath; ///input path of widget
     bool needEncryption;  ///for configuring right task if encryption needed
-    int certLevel;
 };
 
 #endif // INSTALLER_CONTEXT_H