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.

Sign up for GitHub

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

Jump to bottom

Prioritize install_smartcard_packages like package_*_installed #7224

Merged
merged 2 commits into from
Jul 14, 2021
Merged

Prioritize install_smartcard_packages like package_*_installed #7224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2752645
Prioritize install_smartcard_packages like package_*_installed
cipherboy Jul 8, 2021
87be8d3
Add a little more determinism to rule ordering
cipherboy Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ssg/build_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def reorder_according_to_ordering(unordered, ordering, regex=None):
if priority_type in item and item in unordered:
ordered.append(item)
unordered.remove(item)
ordered.extend(list(unordered))
ordered.extend(sorted(unordered))
return ordered


Expand Down Expand Up @@ -925,8 +925,11 @@ def to_xml_element(self):
# The Rules are ordered in more logical way, and
# remediation order is natural, first the package is installed, then configured.
rules_in_group = list(self.rules.keys())
regex = r'(package_.*_(installed|removed))|(service_.*_(enabled|disabled))$'
priority_order = ["installed", "removed", "enabled", "disabled"]
regex = (r'(package_.*_(installed|removed))|' +
r'(service_.*_(enabled|disabled))|' +
r'install_smartcard_packages$')
priority_order = ["installed", "install_smartcard_packages", "removed",
"enabled", "disabled"]
rules_in_group = reorder_according_to_ordering(rules_in_group, priority_order, regex)

# Add rules in priority order, first all packages installed, then removed,
Expand Down