change some returning error-codes

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

diff --git a/src/wgt/step/step_check_settings_level.cc b/src/wgt/step/step_check_settings_level.cc
index 664e376..0d88bb2 100644 (file)
--- a/src/wgt/step/step_check_settings_level.cc
+++ b/src/wgt/step/step_check_settings_level.cc
@@ -37,7 +37,7 @@ common_installer::Step::Status StepCheckSettingsLevel::process() {
   if (!ValidateSettingsForLevel(context_->privilege_level.get(),
       static_cast<WgtBackendData*>(
           context_->backend_data.get())->settings.get())) {
-    return Status::ERROR;
+    return Status::PRIVILEGE_ERROR;
   }
   LOG(INFO) << "Settings privilege level checked";
   return Status::OK;

diff --git a/src/wgt/step/step_generate_xml.cc b/src/wgt/step/step_generate_xml.cc
index 055fd3f..6be0750 100644 (file)
--- a/src/wgt/step/step_generate_xml.cc
+++ b/src/wgt/step/step_generate_xml.cc
@@ -252,7 +252,7 @@ common_installer::Step::Status StepGenerateXml::precheck() {
   }
   if (context_->pkgid.get().empty()) {
     LOG(ERROR) << "pkgid attribute is empty";
-    return Step::Status::INVALID_VALUE;   }
+    return Step::Status::PACKAGE_NOT_FOUND;   }
 
   if (!context_->manifest_data.get()->application) {
     LOG(ERROR) << "No application in package";
@@ -274,7 +274,7 @@ common_installer::Step::Status StepGenerateXml::process() {
     if (!common_installer::CreateDir(xml_path.parent_path())) {
       LOG(ERROR) <<
           "Directory for manifest xml is missing and cannot be created";
-      return Status::ERROR;
+      return Status::MANIFEST_ERROR;
     }
   }
 
@@ -283,7 +283,7 @@ common_installer::Step::Status StepGenerateXml::process() {
   writer = xmlNewTextWriterFilename(context_->xml_path.get().c_str(), 0);
   if (!writer) {
     LOG(ERROR) << "Failed to create new file";
-    return Step::Status::ERROR;
+    return Step::Status::MANIFEST_ERROR;
   }
 
   xmlTextWriterStartDocument(writer, nullptr, nullptr, nullptr);
@@ -475,7 +475,7 @@ common_installer::Step::Status StepGenerateXml::process() {
   if (pkgmgr_parser_check_manifest_validation(
       context_->xml_path.get().c_str()) != 0) {
     LOG(ERROR) << "Manifest is not valid";
-    return Step::Status::ERROR;
+    return Step::Status::MANIFEST_ERROR;
   }
 
   LOG(DEBUG) << "Successfully create manifest xml "

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index ac36e10..315a46d 100644 (file)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -455,22 +455,22 @@ bool StepParse::LocateConfigFile() {
 common_installer::Step::Status StepParse::process() {
   if (!LocateConfigFile()) {
     LOG(ERROR) << "No config.xml";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::MANIFEST_NOT_FOUND;
   }
 
   parser_.reset(new wgt::parse::WidgetConfigParser());
   if (!parser_->ParseManifest(config_)) {
     LOG(ERROR) << "[Parse] Parse failed. " <<  parser_->GetErrorMessage();
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::PARSE_ERROR;
   }
   if (check_start_file_) {
     if (!parser_->HasValidStartFile()) {
       LOG(ERROR) << parser_->GetErrorMessage();
-      return common_installer::Step::Status::ERROR;
+      return common_installer::Step::Status::PARSE_ERROR;
     }
     if (!parser_->HasValidServicesStartFiles()) {
       LOG(ERROR) << parser_->GetErrorMessage();
-      return common_installer::Step::Status::ERROR;
+      return common_installer::Step::Status::PARSE_ERROR;
     }
   }
 
@@ -479,7 +479,7 @@ common_installer::Step::Status StepParse::process() {
   if (!FillManifestX(manifest)) {
     LOG(ERROR) << "[Parse] Storing manifest_x failed. "
                <<  parser_->GetErrorMessage();
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::PARSE_ERROR;
   }
 
   // Copy data from ManifestData to InstallerContext

diff --git a/src/wgt/step/step_parse_recovery.cc b/src/wgt/step/step_parse_recovery.cc
index 7fe4a10..218c2d5 100644 (file)
--- a/src/wgt/step/step_parse_recovery.cc
+++ b/src/wgt/step/step_parse_recovery.cc
@@ -29,7 +29,7 @@ common_installer::Step::Status StepParseRecovery::process() {
 common_installer::Step::Status StepParseRecovery::precheck() {
   if (context_->root_application_path.get().empty()) {
     LOG(ERROR) << "Root path of packages in not set";
-    return Status::ERROR;
+    return Status::INVALID_VALUE;
   }
   if (context_->pkgid.get().empty()) {
     LOG(WARNING) << "Pkgid is not set. Parsing skipped";

diff --git a/src/wgt/step/step_rds_modify.cc b/src/wgt/step/step_rds_modify.cc
index 41b9bc1..95fab9f 100644 (file)
--- a/src/wgt/step/step_rds_modify.cc
+++ b/src/wgt/step/step_rds_modify.cc
@@ -24,21 +24,21 @@ StepRDSModify::StepRDSModify(common_installer::InstallerContext* context)
 common_installer::Step::Status StepRDSModify::precheck() {
   if (context_->unpacked_dir_path.get().empty()) {
     LOG(ERROR) << "unpacked dir path is not set";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::INVALID_VALUE;
   }
   if (!bf::exists(context_->unpacked_dir_path.get())) {
     LOG(ERROR) << "unpacked_dir_path ("
                << context_->unpacked_dir_path.get()
                << ") path does not exist";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::INVALID_VALUE;
   }
   if (context_->pkgid.get().empty()) {
     LOG(ERROR) << "pkgid is not set";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::PACKAGE_NOT_FOUND;
   }
   if (!context_->manifest_data.get()) {
     LOG(ERROR) << "no manifest info available";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::INVALID_VALUE;
   }
   // TODO(w.kosowicz): check if config of installed app was encrypted
   backend_data_ = static_cast<WgtBackendData*>(context_->backend_data.get());

diff --git a/src/wgt/step/step_rds_parse.cc b/src/wgt/step/step_rds_parse.cc
index b98900e..2a459a0 100644 (file)
--- a/src/wgt/step/step_rds_parse.cc
+++ b/src/wgt/step/step_rds_parse.cc
@@ -21,7 +21,7 @@ common_installer::Step::Status StepRDSParse::precheck() {
   bf::path rdsPath(context_->unpacked_dir_path.get() / ".rds_delta");
   if (!bf::exists(rdsPath)) {
     LOG(ERROR) << "no rds_delta file";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::INVALID_VALUE;
   }
   rds_file_path_ = rdsPath;
   return common_installer::Step::Status::OK;
@@ -31,14 +31,14 @@ common_installer::Step::Status StepRDSParse::process() {
   wgt::rds_parser::RDSParser parser(rds_file_path_.native());
   if (!parser.Parse()) {
     LOG(ERROR) << "parsing of rds delta failed";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::PARSE_ERROR;
   }
 
   WgtBackendData* backend_data =
       static_cast<WgtBackendData*>(context_->backend_data.get());
   if (!backend_data) {
     LOG(ERROR) << "no wgt backend data available";
-    return common_installer::Step::Status::ERROR;
+    return common_installer::Step::Status::PARSE_ERROR;
   }
   backend_data->files_to_modify.set(parser.files_to_modify());
   backend_data->files_to_add.set(parser.files_to_add());

diff --git a/src/wgt/step/step_wgt_copy_storage_directories.cc b/src/wgt/step/step_wgt_copy_storage_directories.cc
index c1929c7..fc2e366 100644 (file)
--- a/src/wgt/step/step_wgt_copy_storage_directories.cc
+++ b/src/wgt/step/step_wgt_copy_storage_directories.cc
@@ -31,7 +31,7 @@ common_installer::Step::Status StepWgtCopyStorageDirectories::process() {
   if (status != Status::OK)
     return status;
   if (!CacheDir())
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
 
   int version = context_->manifest_data.get()->api_version[0] - '0';
   if (version < 3) {

diff --git a/src/wgt/step/step_wgt_create_storage_directories.cc b/src/wgt/step/step_wgt_create_storage_directories.cc
index 708cd12..d50d072 100644 (file)
--- a/src/wgt/step/step_wgt_create_storage_directories.cc
+++ b/src/wgt/step/step_wgt_create_storage_directories.cc
@@ -26,28 +26,28 @@ namespace filesystem {
 
 common_installer::Step::Status StepWgtCreateStorageDirectories::process() {
   if (!PrivateDir())
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
 
   char version = context_->manifest_data.get()->api_version[0];
 
   if ((version-'0') < 3) {
     LOG(DEBUG) << "Shared directory preparation for tizen 2.x";
     if (!ShareDir())
-      return Status::ERROR;
+      return Status::APP_DIR_ERROR;
   } else {
     LOG(DEBUG) << "Shared directory preparation for tizen 3.x";
     if (!ShareDirFor3x())
-      return Status::ERROR;
+      return Status::APP_DIR_ERROR;
   }
 
   if (!SubShareDir())
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
 
   if (!CreatePrivateTmpDir())
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
 
   if (!CacheDir())
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
 
   return Status::OK;
 }

diff --git a/src/wgt/step/step_wgt_resource_directory.cc b/src/wgt/step/step_wgt_resource_directory.cc
index 190051f..33671e7 100644 (file)
--- a/src/wgt/step/step_wgt_resource_directory.cc
+++ b/src/wgt/step/step_wgt_resource_directory.cc
@@ -23,17 +23,17 @@ common_installer::Step::Status StepWgtResourceDirectory::process() {
                                         temp_path)) {
     LOG(ERROR) << "Failed to move: " << context_->unpacked_dir_path.get()
                << " to: " << temp_path;
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
   }
   bs::error_code error;
   bf::create_directories(resource_path.parent_path(), error);
   if (error) {
     LOG(ERROR) << "Failed to create proper directory structure in widget";
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
   }
   if (!common_installer::MoveDir(temp_path, resource_path)) {
     LOG(ERROR) << "Failed to move: " << temp_path << " to: " << resource_path;
-    return Status::ERROR;
+    return Status::APP_DIR_ERROR;
   }
 
   LOG(INFO) << "Widget content moved to res/wgt subdirectory";