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

OpenMandrivaSoftware · Mar 26, 2019 · a27b209 · a27b209
2 parents ef27578 + c35d42c
commit a27b209
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/models/build_list.rb b/app/models/build_list.rb
@@ -526,7 +526,8 @@ def abf_worker_args
       'EXTRA_CFG_OPTIONS'             => extra_params['cfg_options'],
       'EXTRA_CFG_URPM_OPTIONS'        => extra_params['cfg_urpm_options'],
       '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!(
       'RERUN_TESTS' => true,

diff --git a/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim b/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim
@@ -27,9 +27,7 @@ h4.offset10= t("activerecord.attributes.build_list.preferences")
     label
       - checked = params[:build_list].try(:[], kind) || kind == :use_cached_chroot
       - checked = @build_list.send(kind) if checked.nil?
-      input[type=     'checkbox'
-            checked=  checked
-            name=     "build_list[#{kind}]" ]
+      = f.check_box kind, {}, "true", "false"
       = BuildList.human_attribute_name kind
 
 - selected = params[:build_list].try(:[], :external_nodes)