modification for seperation of RO/RW location

Requires:
	https://review.tizen.org/gerrit/#/c/60194/
	https://review.tizen.org/gerrit/#/c/60200/

Change-Id: I03e256854ffa6812952b7fb1e3f1e029f6c030ea
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 551313c..5f3c772 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -136,13 +136,13 @@ void ValidatePackageFS(const std::string& pkgid,
   ASSERT_TRUE(bf::exists(cache_path));
 
   bf::path manifest_path =
-      bf::path(getUserManifestPath(getuid())) / (pkgid + ".xml");
+      bf::path(getUserManifestPath(getuid(), false)) / (pkgid + ".xml");
   ASSERT_TRUE(bf::exists(manifest_path));
 
   for (auto& appid : appids) {
     bf::path binary_path = package_path / "bin" / appid;
     ASSERT_TRUE(bf::exists(binary_path));
-    bf::path icon_path = bf::path(getIconPath(getuid())) / (appid + ".png");
+    bf::path icon_path = bf::path(getIconPath(getuid(), false)) / (appid + ".png");
     ASSERT_TRUE(bf::exists(icon_path));
     bf::path icon_backup = ci::GetBackupPathForIconFile(icon_path);
     ASSERT_FALSE(bf::exists(icon_backup));
@@ -170,11 +170,11 @@ void PackageCheckCleanup(const std::string& pkgid,
   ASSERT_FALSE(bf::exists(package_path));
 
   bf::path manifest_path =
-      bf::path(getUserManifestPath(getuid())) / (pkgid + ".xml");
+      bf::path(getUserManifestPath(getuid(), false)) / (pkgid + ".xml");
   ASSERT_FALSE(bf::exists(manifest_path));
 
   for (auto& appid : appids) {
-    bf::path icon_path = bf::path(getIconPath(getuid())) / (appid + ".png");
+    bf::path icon_path = bf::path(getIconPath(getuid(), false)) / (appid + ".png");
     ASSERT_FALSE(bf::exists(icon_path));
     bf::path icon_backup = ci::GetBackupPathForIconFile(icon_path);
     ASSERT_FALSE(bf::exists(icon_backup));

diff --git a/src/wgt/step/step_generate_xml.cc b/src/wgt/step/step_generate_xml.cc
index dd82f5e..71d956f 100644 (file)
--- a/src/wgt/step/step_generate_xml.cc
+++ b/src/wgt/step/step_generate_xml.cc
@@ -245,7 +245,8 @@ common_installer::Step::Status StepGenerateXml::precheck() {
 }
 
 common_installer::Step::Status StepGenerateXml::process() {
-  bf::path xml_path = bf::path(getUserManifestPath(context_->uid.get()))
+  bf::path xml_path =
+      bf::path(getUserManifestPath(context_->uid.get(), false))
       / bf::path(context_->pkgid.get());
   xml_path += ".xml";
   context_->xml_path.set(xml_path.string());