app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb in katello-3.16.0.rc2 vs app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb in katello-3.16.0.rc2.1
- old
+ new
@@ -11,28 +11,26 @@
solve_dependencies = options.fetch(:solve_dependencies, false)
if filter_ids.present? || rpm_filenames.present? || source_repositories.length > 1
sequence do
if filter_ids.present? || rpm_filenames.present?
- copy_action = plan_action(Actions::Pulp3::Repository::CopyContent,
- source_repositories.first, smart_proxy, target_repo,
+ copy_action = plan_action(Actions::Pulp3::Repository::CopyContent, source_repositories.first, smart_proxy, target_repo,
filter_ids: filter_ids, solve_dependencies: solve_dependencies,
rpm_filenames: rpm_filenames)
-
- plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_action.output[:pulp_tasks])
+ plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo,
+ repository_details: { latest_version_href: copy_action.output[:latest_version_href] }, tasks: copy_action.output[:pulp_tasks])
else
#if we are not filtering, copy the version to the cv repository, and the units for each additional repo
action = plan_action(Actions::Pulp3::Repository::CopyVersion, source_repositories.first, smart_proxy, target_repo)
- plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: action.output[:pulp_tasks])
+ plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo,
+ repository_details: { latest_version_href: action.output[:latest_version_output] }, tasks: action.output[:pulp_tasks])
copy_actions = []
#since we're creating a new version from the first repo, start copying at the 2nd
source_repositories[1..-1].each do |source_repo|
- copy_actions << plan_action(Actions::Pulp3::Repository::CopyContent,
- source_repo, smart_proxy, target_repo,
+ copy_actions << plan_action(Actions::Pulp3::Repository::CopyContent, source_repo, smart_proxy, target_repo,
filter_ids: filter_ids, solve_dependencies: solve_dependencies,
rpm_filenames: rpm_filenames)
end
-
plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_actions.last.output[:pulp_tasks])
end
end
else
plan_self(source_version_repo_id: source_repositories.first.id,