From ab59be30e83b4efa8745e9384cb1f239faae1efe Mon Sep 17 00:00:00 2001 From: donghee yang Date: Thu, 16 Aug 2012 12:25:06 +0900 Subject: [PATCH] [Title] Fixed a bug that checking install dependency does not be applied --- src/build_server/BuildJob.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb index 86967c5..db88a7c 100644 --- a/src/build_server/BuildJob.rb +++ b/src/build_server/BuildJob.rb @@ -609,17 +609,16 @@ class BuildJob for dep in @pkginfo.get_install_dependencies( @os ) # if parent exist, search pkginfos for all sub jobs # if not found, check package server - ver_svr = nil + found = false if not @parent.nil? and @parent.type == "MULTIBUILD" then @parent.sub_jobs.each { |j| os = (dep.target_os_list.empty?) ? @os : dep.target_os_list[0] if j.pkginfo.pkg_exist?(dep.package_name, dep.base_version, os) then - ver_svr = dep.base_version - break + found = true; break end } end - if not ver_svr.nil? then next end + if found then next end if not remote_package_of_dependency_exist?(dep) then unmet_ideps.push dep -- 2.34.1