[Title] fixed on-demand install error in multi-profile.

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ic8ba270a8d3edb4d388908d7ce46f3016fd8fca9

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
index 95050dd..18248d6 100644 (file)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
@@ -267,7 +267,7 @@ public class OnDemandInstall {
     }
 
     private final boolean deployPackage(final DebugTool tool) {
-        String local = TOOLS_HOST_PATH + "/" + tool.getSourcepath() + "/" + tool.getBinaryname();
+        String local = tool.getSourcepath() + "/" + tool.getBinaryname();
         String remote = TizenPlatformConstants.TOOLS_TARGET_PATH + "/" + tool.getBinaryname();
         final String cmd;
 
@@ -464,10 +464,11 @@ public class OnDemandInstall {
                     DebugTool dt = null;
                     dt = makeDebugTool(InstallPathConfig.getCommonPlatformPath(), sourcepath, packagename, description);
                     if ( dt == null ) {
-                        makeDebugTool(InstallPathConfig.getPlatformVersionPath(), sourcepath, packagename, description);
+                        dt = makeDebugTool(InstallPathConfig.getPlatformVersionPath(), sourcepath, packagename, description);
+                    }
+                    if ( dt != null ) {
+                        toolLists.add(dt);
                     }
-                    
-                    toolLists.add(dt);
                 }
             }
         } catch (Throwable e) {
@@ -487,10 +488,10 @@ public class OnDemandInstall {
         }
         for (File f : packageFileList) {
             if ( OnDemandInstall.RPM_PACKAGE_TYPE.equals(FileUtil.getFileExtension(f.getName())) ) {
-                dt = makeDebugToolFromRPM(f, device, packagename, sourcepath, description);
+                dt = makeDebugToolFromRPM(f, device, packagename, parentDir + "/" + sourcepath, description);
             }
             else {
-                dt = makeDebugToolFromTar(f, device, packagename, sourcepath, description);
+                dt = makeDebugToolFromTar(f, device, packagename, parentDir + "/" + sourcepath, description);
             }
             if ( dt != null ) {
                 return dt;

diff --git a/package/changelog b/package/changelog
index 6242c68..428d1f1 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.76
+- Fixed on-demand install error in multi-profile
+== gune.kim <gune.kim@samsung.com> 2013-08-21
 * 2.1.75
 - Fixed wrong platform name format 
 == gune.kim <gune.kim@samsung.com> 2013-08-20

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 711483b..514c964 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.75
+Version:2.1.76
 Source:common-eplugin
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>, shingil kang <shingil.kang@samsung.com>