app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb in katello-4.13.1 vs app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb in katello-4.14.0.rc1

- old
+ new

@@ -21,18 +21,22 @@ #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]) 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| + source_repositories[1..].each do |source_repo| # TODO: In a future refactor, can :copy_all be utilized? Filters should not be needed in this code segment. 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, remove_all: false) end plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_actions.last.output[:pulp_tasks]) end end + elsif source_repositories.first.root.is_container_push + copy_action = plan_action(Actions::Pulp3::Repository::CopyContent, source_repositories.first, smart_proxy, target_repo, + copy_all: true) + plan_action(Actions::Pulp3::Repository::SaveVersion, target_repo, tasks: copy_action.output[:pulp_tasks]) else plan_self(source_version_repo_id: source_repositories.first.id, target_repo_id: target_repo.id) target_repo.update!(version_href: source_repositories.first.version_href) end