Add parameter to StepRemovePerUserStorageDirectories

This step's undo operation use StepCreateStorageDirectories
and StepCreateStorageDirectories can be execute with additional parameter

Change-Id: I86d80ede3df46985342daaa8e8c8bcbcdaf68083
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/common/step/filesystem/step_remove_per_user_storage_directories.cc b/src/common/step/filesystem/step_remove_per_user_storage_directories.cc
index 1a220a1..2c60121 100644 (file)
--- a/src/common/step/filesystem/step_remove_per_user_storage_directories.cc
+++ b/src/common/step/filesystem/step_remove_per_user_storage_directories.cc
@@ -35,7 +35,8 @@ Step::Status StepRemovePerUserStorageDirectories::undo() {
           context_->pkgid.get(), context_->uid.get());
   context_->certificate_info.get().author_id.set(author_id);
   std::vector<std::unique_ptr<Step>> steps;
-  steps.emplace_back(new StepCreateStorageDirectories(context_));
+  steps.emplace_back(new StepCreateStorageDirectories(
+      context_, additional_shared_dirs_));
   steps.emplace_back(new StepCreateGlobalAppSymlinks(context_));
 
   for (auto& it : steps) {

diff --git a/src/common/step/filesystem/step_remove_per_user_storage_directories.h b/src/common/step/filesystem/step_remove_per_user_storage_directories.h
index 2669d4a..293a249 100644 (file)
--- a/src/common/step/filesystem/step_remove_per_user_storage_directories.h
+++ b/src/common/step/filesystem/step_remove_per_user_storage_directories.h
@@ -28,11 +28,21 @@ class StepRemovePerUserStorageDirectories : public common_installer::Step {
  public:
   using Step::Step;
 
+  explicit StepRemovePerUserStorageDirectories(InstallerContext* context)
+      : Step(context) {}
+
+  StepRemovePerUserStorageDirectories(InstallerContext* context,
+      const std::vector<const char*> additional_shared_dirs)
+      : Step(context),
+        additional_shared_dirs_(std::move(additional_shared_dirs)) {}
+
   Status process() override;
   Status clean() override { return Status::OK; }
   Status undo() override;
   Status precheck() override { return Status::OK; }
 
+  std::vector<const char*> additional_shared_dirs_;
+
   STEP_NAME(RemovePerUserStorageDirectories)
 };