[Title] Fixed a bug about local package installing and version up(2.0.11)

diff --git a/package/changelog b/package/changelog
index 2ccd4aa45179d3e2830c3b632bf2ded5f24fcfd8..161716628ef76b250df56f951d83d37b68e66aba 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.0.11
+- Fixed a bug in installing dep packages of local package
+== donghee yang <donghee.yang@samsung.com> 2013-01-23
 * 2.0.10
 - hot fix No method error
 == hyoun jiil <jiil.hyoun@samsung.com> 2013-01-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 60bd43c4c607b504ef1998582b9bcfa57ccc4549..d003ee552e0114cc5bd6afa14d6a00c2cf91f59f 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.0.10
+Version :2.0.11
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs

diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb
index a3e381531680cf6353757658a09337d790150645..87d7ca67d1a68d6990e14d8fa009b6edb3bcfa59 100644 (file)
--- a/src/pkg_server/client.rb
+++ b/src/pkg_server/client.rb
@@ -619,8 +619,8 @@ class Client
        private
        def install_local_pkg_internal(pkg_path, trace, force, repos_paths)
 
-               file_name = File.basename(pkg_path)
-               pkg_name = file_name.split('_')[0]
+               pkg_name = Utils.get_package_name_from_package_file( pkg_path )
+               pkg_os = Utils.get_os_from_package_file( pkg_path )
 
                if not File.exist? pkg_path then
                        @log.error "\"#{pkg_path}\" file does not exist"
@@ -629,7 +629,7 @@ class Client
                filename = File.basename(pkg_path)
                ext = File.extname(filename)
                if not ext.eql? ".zip" then
-                       @log.error "\"#{file_name}\" is not zip file. binary package file should have .zip ext"
+                       @log.error "\"#{filename}\" is not zip file. binary package file should have .zip ext"
                        return false
                end
                pkg_name = filename.split("_")[0]
@@ -678,7 +678,7 @@ class Client
 
                if trace then
                        install_dep_pkgs = pkg.install_dep_list
-                       new_pkg_os = pkg.os
+                       new_pkg_os = pkg_os
                        install_dep_pkgs.each do |p|
                                # check local path first
                                if not repos_paths.nil? then