summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-03-10 15:22:56 -0700
committerAshley Penney <ashley.penney@puppetlabs.com>2014-03-10 15:22:56 -0700
commite6c1aa6a02996e97db48110b5baa7a0339315cee (patch)
tree9c432bb88f4ac5539319d271b98a9ad063940db3
parente382c0db5cccfbad21e0b5988b9cd2b3399d6cb8 (diff)
parent36dda7b1803a9bfd9a82439f731923e68a208111 (diff)
downloadpuppet-stdlib-e6c1aa6a02996e97db48110b5baa7a0339315cee.tar.gz
puppet-stdlib-e6c1aa6a02996e97db48110b5baa7a0339315cee.tar.bz2
Merge pull request #233 from apenney/add-back-location
Make sure location_for is used when installing Puppet.
-rw-r--r--Gemfile6
1 files 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