Apply RDS copy error checking.

Change-Id: Ic04371529e534c9ff7fdeadfcb1296c894d6bc50
Signed-off-by: Dongeup Ham <dongeup.ham@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 5b09f1f..d540d24 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130801.2]"
+#define OSP_INSTALLER_VERSION "version=[20130806.1]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index c97881d..d37bfe3 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -331,12 +331,9 @@ PermissionManager::CopyForRds(InstallationContext* pContext, IList* pFileList, b
                        Directory::Create(destDir, true);
                }
                InstallerUtil::Remove(destFile);
+
                r = File::Copy(srcFile, destFile, true);
-               if (IsFailed(r) == true)
-               {
-                       AppLog("File::Copy() failed. [%ls] -> [%ls]", srcFile.GetPointer(), destFile.GetPointer());
-                       continue;
-               }
+               TryReturn(!IsFailed(r), false, "File::Copy() failed, [%ls] -> [%ls]", srcFile.GetPointer(), destFile.GetPointer());
 
                if ((destFile.Contains(pContext->__packageId + DIR_BIN) == true) && (destFile.EndsWith(L".exe") == true))
                {

diff --git a/src/Step/RdsStep.cpp b/src/Step/RdsStep.cpp
index 4ac17c0..87d3b72 100755 (executable)
--- a/src/Step/RdsStep.cpp
+++ b/src/Step/RdsStep.cpp
@@ -130,8 +130,13 @@ RdsStep::OnRdsProcessing(void)
        }
 
        PermissionManager permissionMgr;
-       permissionMgr.CopyForRds(__pContext, pAddedList.get(), __isInstallRequired);
-       permissionMgr.CopyForRds(__pContext, pModifiedList.get(), __isInstallRequired);
+
+       res = permissionMgr.CopyForRds(__pContext, pAddedList.get(), __isInstallRequired);
+       TryReturn(res, INSTALLER_ERROR_INTERNAL_STATE, "permissionMgr.CopyForRds(pAddedList) failed");
+
+       res = permissionMgr.CopyForRds(__pContext, pModifiedList.get(), __isInstallRequired);
+       TryReturn(res, INSTALLER_ERROR_INTERNAL_STATE, "permissionMgr.CopyForRds(pModifiedList) failed");
+
        permissionMgr.ApplyPermissionForRds(__pContext);
 
        GoNextState();