Fix backup/restore shared/shared_tmp directories

Not only .shared/pkgid/data but also .shared/pkgid should be removed.

Change-Id: I2e266160d346e8cdef35947eb6f4ea839a137e77
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/shared_dirs.cc b/src/common/shared_dirs.cc
index 1bc4500..5e753e8 100644 (file)
--- a/src/common/shared_dirs.cc
+++ b/src/common/shared_dirs.cc
@@ -375,7 +375,7 @@ bool BackupSharedDataDirectories(const bf::path& apps_rw,
     const std::string& pkgid) {
   if (!ci::MakeBackup(apps_rw / pkgid / kSharedDataDir))
     return false;
-  if (!ci::MakeBackup(apps_rw / kSharedDir / pkgid / kData))
+  if (!ci::MakeBackup(apps_rw / kSharedDir / pkgid))
     return false;
   if (!ci::MakeBackup(apps_rw / kSharedTmpDir / pkgid))
     return false;
@@ -386,7 +386,7 @@ bool RestoreSharedDataDirectories(const bf::path& apps_rw,
     const std::string& pkgid) {
   if (!ci::RestoreBackup(apps_rw / pkgid / kSharedDataDir))
     return false;
-  if (!ci::RestoreBackup(apps_rw / kSharedDir / pkgid / kData))
+  if (!ci::RestoreBackup(apps_rw / kSharedDir / pkgid))
     return false;
   if (!ci::RestoreBackup(apps_rw / kSharedTmpDir / pkgid))
     return false;
@@ -397,7 +397,7 @@ bool RemoveBackupSharedDataDirectories(const bf::path& apps_rw,
     const std::string& pkgid) {
   if (!ci::RemoveBackup(apps_rw / pkgid / kSharedDataDir))
     return false;
-  if (!ci::RemoveBackup(apps_rw / kSharedDir / pkgid / kData))
+  if (!ci::RemoveBackup(apps_rw / kSharedDir / pkgid))
     return false;
   if (!ci::RemoveBackup(apps_rw / kSharedTmpDir / pkgid))
     return false;