Buildbreak fix 43/87943/2 accepted/tizen/common/20160913.170228 accepted/tizen/ivi/20160913.042225 accepted/tizen/mobile/20160913.042133 accepted/tizen/tv/20160913.042151 accepted/tizen/wearable/20160913.042209 submit/tizen/20160913.003221
authorTomasz Iwanek <t.iwanek@samsung.com>
Mon, 12 Sep 2016 08:25:28 +0000 (10:25 +0200)
committerTomasz Iwanek <t.iwanek@samsung.com>
Mon, 12 Sep 2016 10:18:27 +0000 (03:18 -0700)
Change-Id: Id966e9f9b2c75ea572c8c8184afc329dfd134053

src/wgt/step/configuration/step_check_start_files.cc

index 7bf3ad6..6db5b8e 100644 (file)
@@ -23,17 +23,21 @@ namespace configuration {
 common_installer::Step::Status StepCheckStartFiles::process() {
   bool flag = false;  // it's not important in this step to use this flag
   std::string error;
-  bool result_check = CheckStartFile(static_cast<WgtBackendData*>
-      (context_->backend_data.get())->content.get(),
-      context_->unpacked_dir_path.get(),
-      &flag);
+  auto backend_data =
+      static_cast<WgtBackendData*>(context_->backend_data.get());
+  auto content = std::make_shared<parse::ContentInfo>();
+  if (!backend_data->content.get().src().empty()) {
+    content.reset(new parse::ContentInfo(backend_data->content.get()));
+  }
+
+  bool result_check = CheckStartFile(content, context_->unpacked_dir_path.get(),
+                                     &flag);
   if (!result_check) {
     LOG(ERROR) << "Could not find valid start file";
     return common_installer::Step::Status::PARSE_ERROR;
   }
 
-  result_check = CheckServicesStartFiles(static_cast<WgtBackendData*>(
-      context_->backend_data.get())->service_list.get(),
+  result_check = CheckServicesStartFiles(backend_data->service_list.get(),
       context_->unpacked_dir_path.get(),
       &error);
   if (!result_check) {