Make sure location_for is used when installing Puppet.

diff --git a/Gemfile b/Gemfile
index 876beab73bfa7850a2347b55584b6b0919157ad8..4604d1bf9cc5f2c3e777d45af0995d54d9e1090f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -25,8 +25,10 @@ group :development, :test do
   gem 'beaker-rspec',            :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
+ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
+puppetversion = ENV['GEM_PUPPET_VERSION']
+if puppetversion
+  gem 'puppet', *location_for(puppetversion)
 else
   gem 'puppet', :require => false
 end