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

Merge branch 'master' of github.com:OpenMandrivaSoftware/rosa-build

This commit is contained in:
Wedge 2019-03-26 09:40:09 +03:00
parent ef275786cf c35d42c6fb
commit a27b209779
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/build_list.rb
View File

@ -526,7 +526,8 @@ class BuildList < ActiveRecord::Base
'EXTRA_CFG_OPTIONS' => extra_params['cfg_options'], 'EXTRA_CFG_OPTIONS' => extra_params['cfg_options'],
'EXTRA_CFG_URPM_OPTIONS' => extra_params['cfg_urpm_options'], 'EXTRA_CFG_URPM_OPTIONS' => extra_params['cfg_urpm_options'],
'EXTRA_BUILD_SRC_RPM_OPTIONS' => extra_params['build_src_rpm'], 'EXTRA_BUILD_SRC_RPM_OPTIONS' => extra_params['build_src_rpm'],
'EXTRA_BUILD_RPM_OPTIONS' => extra_params['build_rpm'] 'EXTRA_BUILD_RPM_OPTIONS' => extra_params['build_rpm'],
'PLATFORM_NAME' => build_for_platform.name
} }
cmd_params.merge!( cmd_params.merge!(
'RERUN_TESTS' => true, 'RERUN_TESTS' => true,

4
app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim
View File

@ -27,9 +27,7 @@ h4.offset10= t("activerecord.attributes.build_list.preferences")
label label
- checked = params[:build_list].try(:[], kind) || kind == :use_cached_chroot - checked = params[:build_list].try(:[], kind) || kind == :use_cached_chroot
- checked = @build_list.send(kind) if checked.nil? - checked = @build_list.send(kind) if checked.nil?
input[type= 'checkbox' = f.check_box kind, {}, "true", "false"
checked= checked
name= "build_list[#{kind}]" ]
= BuildList.human_attribute_name kind = BuildList.human_attribute_name kind
- selected = params[:build_list].try(:[], :external_nodes) - selected = params[:build_list].try(:[], :external_nodes)