Skip to content

Update util.rb to fix closing of file. #39

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

Merged
merged 2 commits into from
Apr 25, 2025
Merged

Update util.rb to fix closing of file. #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3a863
Update util.rb to fix closing of file.
adamboutcher Apr 22, 2025
a984736
Update util.rb
adamboutcher Apr 25, 2025
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/util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ def safe_posix_fork(stdin = $stdin, stdout = $stdout, stderr = $stderr, &block)

begin
Dir.foreach('/proc/self/fd') do |f|
if f != '.' && f != '..' && f.to_i >= 3
if %{^\d+$}.match?(f) && f.to_i >= 3
Copy link
Contributor

@ekohl ekohl Apr 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

If you want this to work, it needs to be

Suggested change
if %{^\d+$}.match?(f) && f.to_i >= 3
if %r{^\d+$}.match?(f) && f.to_i >= 3

Edit: but then you run into the original issue again, which is that the last file descriptor can't be closed.

begin
IO.new(f.to_i).close
rescue
Expand Down