From fd48c6a2195db0976ccd8e6f95e09a88948d76a5 Mon Sep 17 00:00:00 2001
From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Tue, 5 Apr 2016 13:59:59 +0200
Subject: [PATCH] Reorder StepUpdateTep

tep_name is passed directly in manifest_x structure during
package registration in pkgmgr_parser database.

Verify that after package update pkgmgr_parser database
still contains correct value of tep_name
(database .pkgmgr_parser.db,
 table: package_info,
 column: package_tep_name).

Change-Id: Iddb5d5244e3a9850e2d07e24576afc2c5356a68d
---
 src/hybrid/hybrid_installer.cc | 3 +--
 src/wgt/wgt_installer.cc       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 9d5675f..9727c54 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -126,6 +126,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::backup::StepBackupIcons>();
       AddStep<ci::backup::StepCopyBackup>();
       AddStep<ci::filesystem::StepCopyTep>();
+      AddStep<ci::pkgmgr::StepUpdateTep>();
       AddStep<tpk::filesystem::StepTpkPatchIcons>();
       AddStep<wgt::filesystem::StepWgtPatchIcons>();
       AddStep<ci::filesystem::StepCreateIcons>();
@@ -138,8 +139,6 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepUpdateApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
-      // TODO(t.iwanek): this step is supposed to be removed as it is quickfix
-      AddStep<ci::pkgmgr::StepUpdateTep>();
       break;
     case ci::RequestType::Uninstall:
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 00624b8..2476a32 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -124,6 +124,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::backup::StepBackupIcons>();
       AddStep<ci::backup::StepCopyBackup>();
       AddStep<ci::filesystem::StepCopyTep>();
+      AddStep<ci::pkgmgr::StepUpdateTep>();
       AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
       AddStep<wgt::filesystem::StepCreateSymbolicLink>();
       AddStep<wgt::filesystem::StepWgtPatchIcons>();
@@ -134,8 +135,6 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::pkgmgr::StepUpdateApplication>();
-      // TODO(t.iwanek): this step is supposed to be removed as it is quickfix
-      AddStep<ci::pkgmgr::StepUpdateTep>();
       break;
     }
     case ci::RequestType::Uninstall: {
-- 
2.7.4