Fix prevent issue
authorDuyoung Jang <duyoung.jang@samsung.com>
Thu, 13 Jun 2013 09:12:04 +0000 (18:12 +0900)
committerDuyoung Jang <duyoung.jang@samsung.com>
Thu, 13 Jun 2013 09:12:04 +0000 (18:12 +0900)
Change-Id: I3b231da50383864d3e2e4bcea39999f5bc1c46c3
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>
inc/InstallerDefs.h
src/Manager/PermissionManager.cpp

index 458ebf2..d4a2403 100755 (executable)
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130613.2]"
+#define OSP_INSTALLER_VERSION "version=[20130613.3]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"
index 18e4b69..fcf9d9b 100755 (executable)
@@ -248,7 +248,6 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        String appRootPath = pContext->__rootPath;
 
        SmackManager smackManager;
-       String label("_");
 
 #if 0
        oldPath = appRootPath + DIR_RES;
@@ -258,7 +257,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        newPath = appRootPath + L"/Res";
        std::unique_ptr< char[] > pResPath(_StringConverter::CopyToCharArrayN(newPath));
        int ret = symlink("./res", pResPath.get());
-       smackManager.AddLabelDir(label, newPath);
+       smackManager.AddLabelDir(pContext->__packageId, newPath);
 #endif
 
 #if 0
@@ -269,7 +268,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        newPath = appRootPath + L"/Home";
        std::unique_ptr< char[] > pHomePath(_StringConverter::CopyToCharArrayN(newPath));
        ret = symlink("./data", pHomePath.get());
-       smackManager.AddLabelDir(label, newPath);
+       smackManager.AddLabelDir(pContext->__packageId, newPath);
 #endif
 
        oldPath = appRootPath + DIR_RES + L"/screen-size-normal";
@@ -335,8 +334,14 @@ PermissionManager::CopyForRds(InstallationContext* pContext, IList* pFileList, b
                {
                        Directory::Create(destDir, true);
                }
+
                InstallerUtil::Remove(destFile);
-               File::Copy(srcFile, destFile, true);
+               r = File::Copy(srcFile, destFile, true);
+               if (IsFailed(r) == true)
+               {
+                       AppLog("File::Copy() failed. [%ls] -> [%ls]", srcFile.GetPointer(), destFile.GetPointer());
+                       continue;
+               }
 
                if (*pFilePath == L"info/manifest.xml")
                {