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

#757: add extra repositories and containers into resque task

This commit is contained in:
Vokhmin Alexey V 2013-02-19 13:42:57 +04:00
parent 8d55f8ef4d
commit d6bb342c02
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/build_list.rb
View File

@ -414,8 +414,7 @@ class BuildList < ActiveRecord::Base
repos = include_repos repos = include_repos
repos |= ['146'] if build_for_platform_id == 376 repos |= ['146'] if build_for_platform_id == 376
include_repos_hash = {}.tap do |h| include_repos_hash = {}.tap do |h|
repos.each do |r| Repository.where(:id => (repos | (extra_repositories || [])) ).each do |repo|
repo = Repository.find r
path = repo.platform.public_downloads_url(nil, arch.name, repo.name) path = repo.platform.public_downloads_url(nil, arch.name, repo.name)
# path.gsub!(/^http:\/\/(0\.0\.0\.0|localhost)\:[\d]+/, 'https://abf.rosalinux.ru') unless Rails.env.production? # path.gsub!(/^http:\/\/(0\.0\.0\.0|localhost)\:[\d]+/, 'https://abf.rosalinux.ru') unless Rails.env.production?
# Path looks like: # Path looks like:
@ -424,9 +423,15 @@ class BuildList < ActiveRecord::Base
# - release # - release
# - updates # - updates
h["#{repo.platform.name}_#{repo.name}_release"] = path + 'release' h["#{repo.platform.name}_#{repo.name}_release"] = path + 'release'
h["#{repo.platform.name}_#{repo.name}_updates"] = path + 'updates' h["#{repo.platform.name}_#{repo.name}_updates"] = path + 'updates' if repo.platform.main?
end end
end end
host = EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host]
BuildList.where(:id => extra_containers).each do |bl|
path = "http://#{host}/downloads/#{bl.save_to_platform.name}/container/"
path << "#{bl.id}/#{bl.arch.name}/#{bl.save_to_repository.name}/release"
include_repos_hash["container_#{bl.id}"] = path
end
if save_to_platform.personal? && use_save_to_repository if save_to_platform.personal? && use_save_to_repository
include_repos_hash["#{save_to_platform.name}_release"] = save_to_platform. include_repos_hash["#{save_to_platform.name}_release"] = save_to_platform.
urpmi_list(nil, nil, false, save_to_repository.name)["#{build_for_platform.name}"]["#{arch.name}"] urpmi_list(nil, nil, false, save_to_repository.name)["#{build_for_platform.name}"]["#{arch.name}"]