Change update policy with app version.

Change-Id: Ib67e00af592c605c9d638e639cecd76d4768abac
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index a322713..cf9501d 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130424.2]"
+#define OSP_INSTALLER_VERSION "version=[20130424.3]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Step/SystemCheckStep.cpp b/src/Step/SystemCheckStep.cpp
index 4bb6119..395a406 100755 (executable)
--- a/src/Step/SystemCheckStep.cpp
+++ b/src/Step/SystemCheckStep.cpp
@@ -104,6 +104,8 @@ SystemCheckStep::OnStateVersionCheck(void)
        std::unique_ptr< PackageInfo > pPackageInfo(_PackageManagerImpl::GetInstance()->GetPackageInfoN(__pContext->__packageId));
        if (pPackageInfo)
        {
+               __pContext->__isUpdated = true;
+
                String oldVersion = pPackageInfo->GetVersion();
                String newVersion = __pContext->__version;
 
@@ -115,15 +117,12 @@ SystemCheckStep::OnStateVersionCheck(void)
                }
                else if (res == VERSION_NEW)
                {
-                       __pContext->__isUpdated = true;
-
                        AppLog("Update version: package = [%ls]", __pContext->__packageId.GetPointer());
                        AppLog("Update version: oldVersion = [%ls] -> newVersion = [%ls]", oldVersion.GetPointer(), newVersion.GetPointer());
                }
                else if (res == VERSION_OLD)
                {
                        AppLog("Lower version: oldVersion = [%ls] -> newVersion = [%ls]", oldVersion.GetPointer(), newVersion.GetPointer());
-                       return INSTALLER_ERROR_PACKAGE_LOWER_VERSION;
                }
                else
                {

diff --git a/src/Step/UninstallStep.cpp b/src/Step/UninstallStep.cpp
index aeade2b..0668206 100755 (executable)
--- a/src/Step/UninstallStep.cpp
+++ b/src/Step/UninstallStep.cpp
@@ -139,8 +139,10 @@ UninstallStep::OnStateGetPackageInfo(void)
        TryReturn(isUninstallable == true, INSTALLER_ERROR_PACKAGE_INVALID, "preload app cannot be uninstalled.");
 
        __pContext->__rootPath = pPackageInfoImpl->GetAppRootPath();
-       if (__pContext->__rootPath.StartsWith(PATH_USR_APPS, 0) == true)
+
+       if (pPackageInfoImpl->IsDownloaded() == false)
        {
+               AppLog("[%ls] is preloaded app.", packageId.GetPointer());
                __pContext->__isPreloaded = true;
        }
 

diff --git a/src/Step/UnpackStep.cpp b/src/Step/UnpackStep.cpp
index 65afb79..1a1e7c3 100755 (executable)
--- a/src/Step/UnpackStep.cpp
+++ b/src/Step/UnpackStep.cpp
@@ -180,7 +180,7 @@ UnpackStep::OnUnzip(void)
 
        AppLog("UnzipTo - START");
        r = unzipper.UnzipTo(newInstallPath);
-       TryReturn(!IsFailed(r), INSTALLER_ERROR_OUT_OF_STORAGE, "UnzipTo(%ls) failed.", newInstallPath.GetPointer());
+       TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(%ls) failed.", newInstallPath.GetPointer());
        AppLog("UnzipTo - END");
 
        // GoNextState();