StepParse must run before StepCheckSignature

The step_parse must be run before the step_signature in both
2 installers(wgt and tpk), in order to get several required
information(api-version, package type and privilege list)
from tizen-manifest.xml or config.xml.

Change-Id: Ifb89639af908d824738232620653861fd65e372b

diff --git a/src/tpk/task.cc b/src/tpk/task.cc
index 0853519..73bc376 100644 (file)
--- a/src/tpk/task.cc
+++ b/src/tpk/task.cc
@@ -92,8 +92,8 @@ int Task::Install() {
 
   ai.AddStep<ci::configure::StepConfigure>();
   ai.AddStep<ci::unzip::StepUnzip>();
-  ai.AddStep<ci::signature::StepCheckSignature>();
   ai.AddStep<tpk::step::StepParse>();
+  ai.AddStep<ci::signature::StepCheckSignature>();
   ai.AddStep<ci::copy::StepCopy>();
   ai.AddStep<tpk::step::StepCreateSymbolicLink>();
   ai.AddStep<ci::security::StepRegisterSecurity>();
@@ -108,8 +108,8 @@ int Task::Update() {
 
   ai.AddStep<ci::configure::StepConfigure>();
   ai.AddStep<ci::unzip::StepUnzip>();
-  ai.AddStep<ci::signature::StepCheckSignature>();
   ai.AddStep<tpk::step::StepParse>();
+  ai.AddStep<ci::signature::StepCheckSignature>();
   ai.AddStep<ci::old_manifest::StepOldManifest>();
   ai.AddStep<ci::backup_manifest::StepBackupManifest>();
   ai.AddStep<ci::backup_icons::StepBackupIcons>();

diff --git a/src/wgt/wgt_backend.cc b/src/wgt/wgt_backend.cc
index 9514ad9..ec584fc 100644 (file)
--- a/src/wgt/wgt_backend.cc
+++ b/src/wgt/wgt_backend.cc
@@ -49,8 +49,8 @@ int main(int argc, char** argv) {
     case ci::PkgMgrInterface::Type::Install : {
       installer.AddStep<ci::configure::StepConfigure>();
       installer.AddStep<ci::unzip::StepUnzip>();
-      installer.AddStep<ci::signature::StepCheckSignature>();
       installer.AddStep<wgt::parse::StepParse>();
+      installer.AddStep<ci::signature::StepCheckSignature>();
       installer.AddStep<ci::copy::StepCopy>();
       installer.AddStep<wgt::symbolic_link::StepCreateSymbolicLink>();
       installer.AddStep<ci::generate_xml::StepGenerateXml>();
@@ -61,8 +61,8 @@ int main(int argc, char** argv) {
     case ci::PkgMgrInterface::Type::Update: {
       installer.AddStep<ci::configure::StepConfigure>();
       installer.AddStep<ci::unzip::StepUnzip>();
-      installer.AddStep<ci::signature::StepCheckSignature>();
       installer.AddStep<wgt::parse::StepParse>();
+      installer.AddStep<ci::signature::StepCheckSignature>();
       installer.AddStep<ci::old_manifest::StepOldManifest>();
       installer.AddStep<ci::backup_manifest::StepBackupManifest>();
       installer.AddStep<ci::backup_icons::StepBackupIcons>();