[Title] Fixed a bug of job assignment

diff --git a/package/changelog b/package/changelog
index 4ec4b9ec16061e490b0d8087517b0cd01aac474c..f8449a7f6ae876a1ecea90f1638024fcec4e5c3b 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.24
+- Fixed a bug that job assignment to child server is wrong
+== donghee yang <donghee.yang@samsung.com> 2013-04-12
 * 2.1.23
 - Modified to make build-server work when max-job is zero
 == donghee yang <donghee.yang@samsung.com> 2013-04-12

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index bc6f0b3ce89e870dd830afc434b014bc6ebb48f4..bc39ff5481e1e0c978e06534ad683a3c3157c5ab 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.23
+Version :2.1.24
 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/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 7985461302f5e3e072407dc241b84a333a147304..b9c9dc9316758ab4fd32d177619eee4eaaed9845 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -237,11 +237,13 @@ class BuildJob < CommonJob
                if @pkginfo.nil? then return false end
 
                @pkginfo.packages.each do |pkg|
-                       if pkg.os_list.include? @os and pkg.build_host_os.include? host_os then
-                               return true
+                       if not pkg.os_list.include? @os then next end
+                       if not pkg.build_host_os.include? host_os then
+                               return false
                        end
                end
-               return false
+
+               return true
        end