From 81df459372f393fd1e6675b6f01236a9ab7ccb05 Mon Sep 17 00:00:00 2001
From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Fri, 27 Mar 2015 14:26:55 +0100
Subject: [PATCH] Xml manifest path in InstallerContext

This commit changes xml_path type to fs::type.
It also removes unnecessary setting from step_generate_xml

Change-Id: I2bc99da823959a4968802ca47367b6b1f2fca57c
Signed-off-by: Pawel Sikorski <p.sikorski@samsung.com>
---
 src/common/context_installer.h       | 4 +++-
 src/common/step/step_generate_xml.cc | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common/context_installer.h b/src/common/context_installer.h
index 678223b..2d5532f 100644
--- a/src/common/context_installer.h
+++ b/src/common/context_installer.h
@@ -5,6 +5,8 @@
 
 #include <pkgmgr_parser.h>
 
+#include <boost/filesystem/path.hpp>
+
 #include <unistd.h>
 #include <sys/types.h>
 
@@ -56,7 +58,7 @@ class ContextInstaller {
   Property<manifest_x*> manifest_data;
 
   // path to manifest xml file used to register data in databases
-  Property<std::string> xml_path;
+  Property<boost::filesystem::path> xml_path;
 
   // pkgid used for update or uninstallation processing
   Property<std::string> pkgid;
diff --git a/src/common/step/step_generate_xml.cc b/src/common/step/step_generate_xml.cc
index e393538..89ad27b 100644
--- a/src/common/step/step_generate_xml.cc
+++ b/src/common/step/step_generate_xml.cc
@@ -102,11 +102,6 @@ Step::Status StepGenerateXml::GenerateApplicationCommonXml(T* app,
 Step::Status StepGenerateXml::process() {
   assert(context_->manifest_data.get());
 
-  fs::path xml_path = fs::path(getUserManifestPath(context_->uid.get()))
-      / fs::path(context_->pkgid.get());
-  xml_path += ".xml";
-
-  context_->xml_path.set(xml_path.string());
   boost::system::error_code error;
   if ((!context_->manifest_data.get()->uiapplication) &&
      (!context_->manifest_data.get()->serviceapplication)) {
-- 
2.7.4