[Title] Fixed a bug that reverse build does not work

diff --git a/package/changelog b/package/changelog
index 5927b6de0bdb5b69b794c88747e6e337277274b5..52dd1f7e557b09e64526d49827199c02c4107385 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.2.7
+- Fixed a bug that reverse build choose wrong distribution project
+== hyoun jiil <jiil.hyoun@samsung.com> 2011-10-17
 * 1.2.6
 - Increase TimeOut to 30 sec
 == hyoun jiil <jiil.hyoun@samsung.com> 2011-10-17

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 724c5ab42001d175d14eda7d63901146a59af26c..c8411e4362bdf15e3d57cf74e3061d06cbecb0f5 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :1.2.6
+Version :1.2.7
 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 c0d9f089d6e705aa8b10ab25a6bfd0a2d639b8d0..3767788a8470957f54477d29967520a9a93c90c0 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -477,7 +477,7 @@ class BuildJob < CommonJob
                                # package as item
                                @pkgsvr_client.get_pkg_from_list(x.package_name, os)
                        end
-                       prjs = @server.prjmgr.get_projects_from_pkgs(pkgs)
+                       prjs = @server.prjmgr.get_projects_from_pkgs(pkgs, get_distribution_name())
                        @build_dep_prjs = prjs
                end
 

diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb
index f4a647caeeddd0e626c23b5bdf78d49896c762d6..f699d8a231c57c6b7c3416e21edaaf78b5f59a87 100644 (file)
--- a/src/build_server/ProjectManager.rb
+++ b/src/build_server/ProjectManager.rb
@@ -188,9 +188,12 @@ class ProjectManager
 
        # get project that includes specified pkg name and os
        # will return [project,os,ver] list
-       def get_projects_from_pkgs(pkgs)
+       def get_projects_from_pkgs(pkgs, dist_name="BASE")
                result = []
                @projects.each do |prj|
+                       # check distribution name
+                       if prj.dist_name != dist_name then next end
+
                        pkgs.each do |pkg|
                                name = pkg.package_name
                                ver =  pkg.version

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 45681b1784467689a2968837cf6b0a36f30261c1..793106a16238d4b0e5b76966e57743a01d44b228 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -437,7 +437,7 @@ class RegisterPackageJob < CommonJob
                        rev_pkgs += @pkgsvr_client.get_reverse_source_dependent_packages(@pkg_name)
                end
 
-               rev_projects = @server.prjmgr.get_projects_from_pkgs(rev_pkgs)
+               rev_projects = @server.prjmgr.get_projects_from_pkgs(rev_pkgs, get_distribution_name())
 
                # create reverse build job
                rev_build_jobs = []

diff --git a/src/build_server/ReverseBuildChecker.rb b/src/build_server/ReverseBuildChecker.rb
index b35f28125041411e7a5562f25801601bc702d92c..e778609e2f883c3774110ce27c155f81d1ab7521 100644 (file)
--- a/src/build_server/ReverseBuildChecker.rb
+++ b/src/build_server/ReverseBuildChecker.rb
@@ -73,7 +73,7 @@ class ReverseBuildChecker
                        rev_pkgs += job.pkgsvr_client.get_reverse_source_dependent_packages(pkg_name)
                end
                rev_pkgs.uniq!
-               rev_projects = job.server.prjmgr.get_projects_from_pkgs(rev_pkgs)
+               rev_projects = job.server.prjmgr.get_projects_from_pkgs(rev_pkgs, job.get_distribution_name())
 
                # create reverse build job
                rev_build_jobs = []