summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tool/lib/leakchecker.rb5
-rw-r--r--version.h2
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)
diff --git a/version.h b/version.h
index 799e99cdd0..833742a29c 100644
--- a/version.h
+++ b/version.h
@@ -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"