Skip to content

remove Upgrades header #613

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

Open
muald wants to merge 7 commits into
base: main
Choose a base branch
from
Open

remove Upgrades header #613

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
482f506
remove Upgrades header
muald Aug 14, 2026
061fde6
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 1, 2026
5ae1b9f
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 4, 2026
f5acdd4
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 4, 2026
c09be84
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 7, 2026
4fe8f28
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 8, 2026
0bfe31f
Merge branch 'main' into fix-remove-upgrades-header
muald Sep 16, 2026
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
2 changes: 1 addition & 1 deletion lib/puppet/provider/package/yum.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def self.check_updates(disablerepo, enablerepo, disableexcludes)
def self.parse_updates(str)
# Strip off all content that contains Obsoleting, Security: or Update
body = str.partition(/^(Obsoleting|Security:|Update)/).first

body = body.gsub(/^Upgrades.*?$/m, '')

@nsballmann nsballmann Sep 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
body = body.gsub(/^Upgrades.*?$/m, '')
body = body.gsub(/^Upgrades.*?$/m, '')

I would keep the empty newline after the body modifications.

Suggested change
body = body.gsub(/^Upgrades.*?$/m, '')
body.gsub!(/^Upgrades.*?$/m, '')

@OpenVoxProject do you prefer the in-place gsub call?

@nsballmann nsballmann Sep 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@muald I just learnt that in Ruby RegExp the anchors ^ and $ match in m mode actually at the line boundaries and not at the string boundaries (according to the back of my head this used to be different... in Python). This means, due to the $ anchor the match will definitely anchor at the end of the first line. As we want the whole first line gone, we then probably don't need the non-greedy ?.

But we definitely need the m mode otherwise $ would anchor at the end of the whole body string.

We do leave an empty newline after the substitution.

Alternatively, without m mode, we could also do this:

Suggested change
body = body.gsub(/^Upgrades.*?$/m, '')
# https://regex101.com/r/LiVD53/2/substitution
body.gsub!(/^Upgrades.*\R/, '')

This would remove only the whole first line of the body, if it starts with Upgrades.

@bastelfreak what do you think?

updates = Hash.new { |h, k| h[k] = [] }

body.split(/^\s*\n/).each do |line|
Expand Down