Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#823: write "fullname" instead of "sha1" for old_packages

This commit is contained in:
Vokhmin Alexey V 2013-01-14 16:10:56 +04:00
parent 73b769aeb5
commit e55a4ef7e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/abf_worker/build_lists_publish_task_manager.rb
View File

@ -85,7 +85,7 @@ module AbfWorker
build_lists.each do |bl| build_lists.each do |bl|
fill_packages(bl, packages) fill_packages(bl, packages)
bl.last_published.includes(:packages).limit(5).each{ |old_bl| bl.last_published.includes(:packages).limit(5).each{ |old_bl|
fill_packages(old_bl, old_packages) fill_packages(old_bl, old_packages, :fullname)
} }
build_list_ids << bl.id build_list_ids << bl.id
@redis.lpush(LOCKED_BUILD_LISTS, bl.id) @redis.lpush(LOCKED_BUILD_LISTS, bl.id)
@ -103,10 +103,10 @@ module AbfWorker
return true return true
end end
def fill_packages(bl, results_map) def fill_packages(bl, results_map, field = :sha1)
# TODO: remove duplicates of sources for different arches # TODO: remove duplicates of sources for different arches
results_map[:sources] |= bl.packages.by_package_type('source').pluck(:sha1) results_map[:sources] |= bl.packages.by_package_type('source').pluck(field)
results_map[:binaries][bl.arch.name.to_sym] |= bl.packages.by_package_type('binary').pluck(:sha1) results_map[:binaries][bl.arch.name.to_sym] |= bl.packages.by_package_type('binary').pluck(field)
end end
end end