[Tizen-submit] 16060: Changes to Tizen:2.1:Main/wrt-installer

noreply at tizen.org noreply at tizen.org
Mon Oct 14 13:28:17 GMT 2013


Hi,
Soyoung Kim have made the following changes to wrt-installer in project Tizen:2.1:Main. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16060

  submit:       Tizen:2.1:Main:build/wrt-installer(cleanup) -> Tizen:2.1:Main


Message:
Submitter: Soyoung Kim <sy037.kim at samsung.com>
Comments: Fixed N_SE-36589
Git project: platform/framework/web/wrt-installer
Tag: submit/tizen_2.1/20130514.073020
Commit: a8248351116ce412dcd9128625626bf728ce39bd Fixed crash when RDS mode is not supported

State:   superseded 2013-10-14T13:26:33 tizenrobot
Comment: superseded by 16061

History: new        2013-10-14T13:26:28 tizenrobot
old:
----
  wrt-installer-0.1.58.3.tar.gz

new:
----
  wrt-installer-0.1.58.tar.gz

spec files:
-----------
--- wrt-installer.spec
+++ wrt-installer.spec
@@ -1,9 +1,9 @@
-#git:framework/web/wrt-installer wrt-installer_0.1.58.3
+#git:framework/web/wrt-installer wrt-installer_0.1.58
 Name:       wrt-installer
 Summary:    Installer for tizen Webruntime
-Version:    0.1.58.3
+Version:    0.1.58
 Release:    1
-VCS:        framework/web/wrt-installer#submit/tizen_2.1/20130517.120521-0-g5be0856
+VCS:        platform/framework/web/wrt-installer#submit/tizen_2.1/20130514.073020-0-ga8248351116ce412dcd9128625626bf728ce39bd
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
 URL:        N/A

other changes:
--------------

++++++ wrt-installer-0.1.58.3.tar.gz -> wrt-installer-0.1.58.tar.gz
--- packaging/wrt-installer.spec
+++ packaging/wrt-installer.spec
@@ -1,7 +1,7 @@
-#git:framework/web/wrt-installer wrt-installer_0.1.58.3
+#git:framework/web/wrt-installer wrt-installer_0.1.58
 Name:       wrt-installer
 Summary:    Installer for tizen Webruntime
-Version:    0.1.58.3
+Version:    0.1.58
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
--- src/jobs/widget_install/job_widget_install.cpp
+++ src/jobs/widget_install/job_widget_install.cpp
@@ -545,9 +545,13 @@
     std::string installPath =
         std::string(GlobalConfig::GetUserInstalledWidgetPath()) +
         "/" + pkgId;
+    std::string preinstallPath =
+        std::string(GlobalConfig::GetUserPreloadedWidgetPath()) +
+        "/" + pkgId;
 
     struct stat dirStat;
-    if ((stat(installPath.c_str(), &dirStat) == 0))
+    if ((stat(installPath.c_str(), &dirStat) == 0) ||
+        (stat(preinstallPath.c_str(), &dirStat) == 0))
     {
         return false;
     }
--- src/jobs/widget_install/task_manifest_file.cpp
+++ src/jobs/widget_install/task_manifest_file.cpp
@@ -111,7 +111,6 @@
         // for widget update.
         AddStep(&TaskManifestFile::stepBackupIconFiles);
         AddStep(&TaskManifestFile::stepCopyIconFiles);
-        AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
         AddStep(&TaskManifestFile::stepCreateExecFile);
         AddStep(&TaskManifestFile::stepGenerateManifest);
         AddStep(&TaskManifestFile::stepParseUpgradedManifest);
@@ -120,7 +119,6 @@
         AddAbortStep(&TaskManifestFile::stepAbortIconFiles);
     } else {
         AddStep(&TaskManifestFile::stepCopyIconFiles);
-        AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
         AddStep(&TaskManifestFile::stepCreateExecFile);
         AddStep(&TaskManifestFile::stepGenerateManifest);
         AddStep(&TaskManifestFile::stepParseManifest);
@@ -306,68 +304,6 @@
         "Widget iconfile copy Finished");
 }
 
-void TaskManifestFile::stepCopyLiveboxFiles()
-{
-    LogDebug("Copy Livebox Files");

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list