Project

General

Profile

« Previous | Next » 

Revision 7c9bc731

Added by Justin Sherrill about 10 years ago

fixes #4752 - fixed repository creation error due to improper puppet detection

also fixes double content environment add for candlepin versus adding and deleting
the appropriate ids

View differences:

app/lib/actions/candlepin/environment/set_content.rb
delete_ids = saved_cp_ids - input[:content_ids]
output[:add_ids] = add_ids
output[:add_response] = ::Katello::Resources::Candlepin::Environment.
unless add_ids.empty?
output[:add_response] = ::Katello::Resources::Candlepin::Environment.
add_content(input[:cp_environment_id], add_ids)
end
output[:delete_ids] = delete_ids
output[:delete_response] = ::Katello::Resources::Candlepin::Environment.
add_content(input[:cp_environment_id], delete_ids)
unless delete_ids.empty?
output[:delete_response] = ::Katello::Resources::Candlepin::Environment.
delete_content(input[:cp_environment_id], delete_ids)
end
end
end
end
app/lib/actions/katello/repository/create.rb
plan_self
org = repository.organization
path = repository.relative_path if repository.puppet?
path = repository.relative_path unless repository.puppet?
sequence do
plan_action(Actions::Pulp::Repository::Create,

Also available in: Unified diff