From 36dda7b1803a9bfd9a82439f731923e68a208111 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 10 Mar 2014 15:19:03 -0700
Subject: Make sure location_for is used when installing Puppet.

---
 Gemfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 876beab..4604d1b 100644
--- 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
-- 
cgit v1.2.3