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

#403: refactoring of AbfWorkerService::Rpm

This commit is contained in:
Vokhmin Alexey V 2014-06-21 00:24:21 +04:00
parent 88b0d54f02
commit 0d1af0e276
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/services/abf_worker_service/rpm.rb
View File

@ -87,31 +87,12 @@ module AbfWorkerService
bl = build_lists[0] bl = build_lists[0]
return false if !bl && old_packages[:sources].empty? && old_packages[:binaries].values.flatten.empty? return false if !bl && old_packages[:sources].empty? && old_packages[:binaries].values.flatten.empty?
save_to_repository = ::Repository.find(save_to_repository_id)
# Checks mirror sync status # Checks mirror sync status
return false if save_to_repository.repo_lock_file_exists? || !save_to_repository.platform.ready? return false if save_to_repository.repo_lock_file_exists? || !save_to_repository.platform.ready?
repository_status = save_to_repository.repository_statuses.find_or_create_by(platform_id: build_for_platform_id) repository_status = save_to_repository.repository_statuses.find_or_create_by(platform_id: build_for_platform_id)
return false unless repository_status.publish return false unless repository_status.publish
save_to_platform = save_to_repository.platform
build_for_platform = Platform.find build_for_platform_id
platform_path = "#{save_to_platform.path}/repository"
if save_to_platform.personal?
platform_path << '/' << build_for_platform.name
system "mkdir -p #{platform_path}"
end
distrib_type = build_for_platform.distrib_type
cmd_params = {
'RELEASED' => save_to_platform.released,
'REPOSITORY_NAME' => save_to_repository.name,
'TYPE' => distrib_type,
'SAVE_TO_PLATFORM' => save_to_platform.name,
'BUILD_FOR_PLATFORM' => build_for_platform.name,
'TESTING' => testing
}.map{ |k, v| "#{k}=#{v}" }.join(' ')
options = { options = {
id: (bl ? bl.id : Time.now.to_i), id: (bl ? bl.id : Time.now.to_i),
cmd_params: cmd_params, cmd_params: cmd_params,
@ -145,6 +126,44 @@ module AbfWorkerService
protected protected
def platform_path
@platform_path ||= begin
path = "#{save_to_platform.path}/repository"
if save_to_platform.personal?
path << '/' << build_for_platform.name
system "mkdir -p #{path}"
end
path
end
end
def cmd_params
{
'RELEASED' => save_to_platform.released,
'REPOSITORY_NAME' => save_to_repository.name,
'TYPE' => distrib_type,
'SAVE_TO_PLATFORM' => save_to_platform.name,
'BUILD_FOR_PLATFORM' => build_for_platform.name,
'TESTING' => testing
}.map{ |k, v| "#{k}=#{v}" }.join(' ')
end
def save_to_repository
@save_to_repository ||= ::Repository.find(save_to_repository_id)
end
def save_to_platform
@save_to_platform ||= save_to_repository.platform
end
def build_for_platform
@build_for_platform ||= Platform.find(build_for_platform_id)
end
def distrib_type
@distrib_type ||= build_for_platform.distrib_type
end
def fill_in_packages def fill_in_packages
packages, build_list_ids, new_sources = packages_structure, [], {} packages, build_list_ids, new_sources = packages_structure, [], {}
build_lists.each do |bl| build_lists.each do |bl|