diff options
author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-03-10 15:19:03 -0700 |
---|---|---|
committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-03-10 15:19:03 -0700 |
commit | 36dda7b1803a9bfd9a82439f731923e68a208111 (patch) | |
tree | 9c432bb88f4ac5539319d271b98a9ad063940db3 /Gemfile | |
parent | 0fabaa5f07d52feed34b6d58b586ee937752578c (diff) |
Make sure location_for is used when installing Puppet.
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |