Skip to content

Commit e6c1aa6

Browse files
author
Ashley Penney
committed
Merge pull request #233 from apenney/add-back-location
Make sure location_for is used when installing Puppet.
2 parents e382c0d + 36dda7b commit e6c1aa6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ group :development, :test do
2525
gem 'beaker-rspec', :require => false
2626
end
2727

28-
if puppetversion = ENV['PUPPET_GEM_VERSION']
29-
gem 'puppet', puppetversion, :require => false
28+
ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
29+
puppetversion = ENV['GEM_PUPPET_VERSION']
30+
if puppetversion
31+
gem 'puppet', *location_for(puppetversion)
3032
else
3133
gem 'puppet', :require => false
3234
end

0 commit comments

Comments
 (0)