Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #33855 - Allow adding filter on same RPM name with different architectures #9767

Merged
merged 1 commit into from
Nov 11, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/models/katello/content_view_package_filter_rule.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ def ensure_unique_attributes
:version => self.version,
:content_view_filter_id => self.content_view_filter_id,
:min_version => self.min_version,
:max_version => self.max_version)
:max_version => self.max_version,
:architecture => self.architecture)
other = other.where.not(:id => self.id) if self.id
if other.exists?
errors.add(:base, "This package filter rule already exists.")
Expand Down