(#16757) Don't load rubygems if bundler is running

If bundler is handling gems we don't want to load rubygems ourselves, as it
can conflict and cause loading of system gems beyond what bundler has set up.

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/puppet b/bin/puppet
index 57a32b8dd..aa568174a 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
 # Load rubygems so we can require gems
-begin
-  require 'rubygems'
-rescue LoadError
+unless defined? Bundler::Setup
+  begin
+    require 'rubygems'
+  rescue LoadError
+  end
 end
 
 require 'puppet/util/command_line'