Skip to content

Commit eca1682

Browse files
quba42sbernhard
authored andcommitted
Fixes #38156 - Do not call content on root during re-import
Affects only RHEL content when the repository being imported already exists on the importing Katello instance. This might be the case because it has been added as a "Red Hat Repository" on both instances from a manifest file. Or else, because this is a re-import of a newer export state to update a previously imported state.
1 parent 614ec0b commit eca1682

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

app/services/katello/pulp3/content_view_version/importable_repositories.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def generate!
2929

3030
root = product.root_repositories.find do |r|
3131
if repo.content&.id && repo.redhat
32-
repo_exists = r.content.cp_content_id == repo.content.id &&
32+
repo_exists = r.library_instance.content.cp_content_id == repo.content.id &&
3333
r.arch == repo.arch &&
3434
r.major == repo.major &&
3535
r.minor == repo.minor

0 commit comments

Comments
 (0)