diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-05-07 12:10:06 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-05-07 12:10:06 -0700 |
| commit | 226c191e275137e4f13092b001a691ee7b7936ba (patch) | |
| tree | 74810d0b8dbd66294f279ea6adfdec49e42687c5 /Gemfile | |
| parent | 3e59bbd2dbaf2e40abc786411e3bf3998f6e715d (diff) | |
| parent | 77ea8439fedcb82452a83af78c5378e4d1ee3c10 (diff) | |
| download | puppet-stdlib-226c191e275137e4f13092b001a691ee7b7936ba.tar.gz puppet-stdlib-226c191e275137e4f13092b001a691ee7b7936ba.tar.bz2 | |
Merge branch 'fix_facts_dot_d_with_pe'
* fix_facts_dot_d_with_pe:
(maint) Indent facter_dot_d with 2 spaces
(#20582) Restore facter_dot_d to stdlib for PE users
Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
(maint) Update Gemfile with GEM_FACTER_VERSION
closes #153
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -24,7 +24,16 @@ group :development, :test do gem 'rspec-puppet', :require => false end -if puppetversion = ENV['PUPPET_GEM_VERSION'] +facterversion = ENV['GEM_FACTER_VERSION'] +if facterversion + gem 'facter', *location_for(facterversion) +else + gem 'facter', :require => false +end + +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 |