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

Fix native build

This commit is contained in:
Wedge 2016-03-29 15:46:08 +03:00
parent 1338cbcb4c
commit 8e7cf0dcaf
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/jobs_controller.rb
View File

@ -23,16 +23,12 @@ class Api::V1::JobsController < Api::V1::BaseController
params = [] params = []
sql_normal << 'arch_id IN (?)' if !arch_ids.empty? sql_normal << 'arch_id IN (?)' if !arch_ids.empty?
params << arch_ids if !arch_ids.empty? params << arch_ids if !arch_ids.empty?
sql_normal << 'platform_id IN (?)' if !platform_ids.empty?
params << platform_ids if !platform_ids.empty?
sql_normal << 'native_build=false' sql_normal << 'native_build=false'
sql_normal *= ' AND ' sql_normal *= ' AND '
sql_native_arch = 'arch_id IN (?)' sql_native_arch = 'arch_id IN (?)'
params << native_arch_ids params << native_arch_ids
sql_native_arch << ' AND platform_id IN (?)' if !platform_ids.empty?
params << platform_ids if !platform_ids.empty?
sql_native_arch << ' AND native_build=true' sql_native_arch << ' AND native_build=true'
build_lists = BuildList.where(sql_normal + ' OR ' + sql_native_arch, *params) build_lists = BuildList.where(sql_normal + ' OR ' + sql_native_arch, *params).for_platform(platform_ids)
end end
build_lists = build_lists.for_status([BuildList::BUILD_PENDING, BuildList::RERUN_TESTS]). build_lists = build_lists.for_status([BuildList::BUILD_PENDING, BuildList::RERUN_TESTS]).
where(user_id: uid).where(builder: nil).oldest.order(:created_at) where(user_id: uid).where(builder: nil).oldest.order(:created_at)