From: Ilho Kim Date: Fri, 26 Apr 2019 05:57:26 +0000 (+0900) Subject: Combine Plugin Steps X-Git-Tag: submit/tizen/20190531.072406~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c935aad87d869e8cc3b0f0c0eb2657a10cdeb8cd;p=platform%2Fcore%2Fappfw%2Ftpk-backend.git Combine Plugin Steps StepRunParserPlugin combines below steps - StepRegisterPluginInfo - StepUpdatePluginInfo - StepUnregisterPluginInfo Related changes [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/204652/ [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/204757/ [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/205385/ Change-Id: I4a4730f20ab09c98e6040eda901258f94e050e21 Signed-off-by: Ilho Kim --- diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc index fa59915..8ebef6e 100644 --- a/src/tpk/tpk_installer.cc +++ b/src/tpk/tpk_installer.cc @@ -63,14 +63,11 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include #include #include @@ -162,7 +159,6 @@ void TpkInstaller::InstallSteps() { AddStep(); AddStep( ci::Plugin::ActionType::Install); - AddStep(); AddStep(); AddStep(); AddStep(); @@ -212,7 +208,6 @@ void TpkInstaller::UpdateSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); AddStep(); @@ -244,7 +239,6 @@ void TpkInstaller::UninstallSteps() { AddStep(); AddStep( ci::Plugin::ActionType::Uninstall); - AddStep(); AddStep(); } @@ -289,7 +283,6 @@ void TpkInstaller::ReinstallSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); } @@ -341,7 +334,6 @@ void TpkInstaller::DeltaSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); AddStep(); @@ -421,7 +413,6 @@ void TpkInstaller::MountInstallSteps() { AddStep(); AddStep( ci::Plugin::ActionType::Install); - AddStep(); AddStep(); AddStep(true); AddStep(); @@ -470,7 +461,6 @@ void TpkInstaller::MountUpdateSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(true); AddStep(); @@ -504,7 +494,6 @@ void TpkInstaller::ManifestDirectInstallSteps() { ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep(ci::Plugin::ActionType::Install); - AddStep(); AddStep(); AddStep(); AddStep(); @@ -538,7 +527,6 @@ void TpkInstaller::ManifestDirectUpdateSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); AddStep(); @@ -562,7 +550,6 @@ void TpkInstaller::ManifestPartialInstallSteps() { ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep(ci::Plugin::ActionType::Install); - AddStep(); AddStep(); AddStep(); } @@ -586,7 +573,6 @@ void TpkInstaller::ManifestPartialUpdateSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); } @@ -598,8 +584,6 @@ void TpkInstaller::PartialUninstallSteps() { AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, ci::configuration::StepParseManifest::StoreLocation::NORMAL); - AddStep( - ci::Plugin::ActionType::Uninstall); AddStep(); AddStep(); AddStep(); @@ -608,8 +592,9 @@ void TpkInstaller::PartialUninstallSteps() { AddStep(); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Uninstall); - AddStep(); AddStep(); + AddStep( + ci::Plugin::ActionType::Uninstall); } void TpkInstaller::ReadonlyUpdateInstallSteps() { @@ -651,7 +636,6 @@ void TpkInstaller::ReadonlyUpdateInstallSteps() { ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); AddStep(); AddStep(); } @@ -690,7 +674,6 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() { AddStep(); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - AddStep(); } void TpkInstaller::DisablePkgSteps() { @@ -700,10 +683,9 @@ void TpkInstaller::DisablePkgSteps() { ci::configuration::StepParseManifest::StoreLocation::NORMAL); AddStep(); AddStep( - ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable); + ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable); AddStep( - ci::Plugin::ActionType::Uninstall); - AddStep(); + ci::Plugin::ActionType::Uninstall); } void TpkInstaller::EnablePkgSteps() { @@ -712,9 +694,9 @@ void TpkInstaller::EnablePkgSteps() { ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, ci::configuration::StepParseManifest::StoreLocation::NORMAL); AddStep( - ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable); + ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable); AddStep( - ci::Plugin::ActionType::Install); + ci::Plugin::ActionType::Install); } void TpkInstaller::MigrateExtImgSteps() {