diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-07-17 09:54:51 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-07-17 09:54:51 +0900 |
| commit | 9d8d0585ec35070099e4fdeef5ee18f6fbf339b6 (patch) | |
| tree | 471c45a4e6f482168ca81ba447e6f815a9605a8a | |
| parent | 62763658d53a66ad624e1c730742cb3811d18329 (diff) | |
merge revision(s) f6adc5be94a9f70a5b9897b81dabdeb49b573393,bccdc041665032b819fab1c04ed4dbdfeeeb366b: [Backport #19582]
Check if Bundler is defined
---
tool/lib/leakchecker.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Check if `Bundler::EnvironmentPreserver` is defined
Only `Bundler` might be defined. `EnvironmentPreserver` and its
`BUNDLER_PREFIX` would be defined together in the same file.
---
tool/lib/leakchecker.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
| -rw-r--r-- | tool/lib/leakchecker.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tool/lib/leakchecker.rb b/tool/lib/leakchecker.rb index 1966145588..4cd28b9dd5 100644 --- a/tool/lib/leakchecker.rb +++ b/tool/lib/leakchecker.rb @@ -233,9 +233,12 @@ class LeakChecker old_env = @env_info new_env = find_env return false if old_env == new_env + if defined?(Bundler::EnvironmentPreserver) + bundler_prefix = Bundler::EnvironmentPreserver::BUNDLER_PREFIX + end (old_env.keys | new_env.keys).sort.each {|k| # Don't report changed environment variables caused by Bundler's backups - next if k.start_with?(Bundler::EnvironmentPreserver::BUNDLER_PREFIX) + next if bundler_prefix and k.start_with?(bundler_prefix) if old_env.has_key?(k) if new_env.has_key?(k) @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 82 +#define RUBY_PATCHLEVEL 83 #include "ruby/version.h" #include "ruby/internal/abi.h" |