Skip to content

Commit

Permalink
Merge pull request #815 from justinstoller/maint/master/dont-install-…
Browse files Browse the repository at this point in the history
…multiple-times

Call install_* methods only once in spec_helper_acceptance
  • Loading branch information
Ashley Penney committed Aug 11, 2014
2 parents 476c31a + 05370c2 commit e48b509
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@


unless ENV['RS_PROVISION'] == 'no'
# This will install the latest available package on el and deb based
# systems fail on windows and osx, and install via gem on other *nixes
foss_opts = { :default_action => 'gem_install' }

if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end

hosts.each do |host|
if host['platform'] =~ /debian/
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
end
if host.is_pe?
install_pe
else
install_puppet
on host, "mkdir -p #{host['distmoduledir']}"
end

on host, "mkdir -p #{host['distmoduledir']}"
end
end

Expand Down

0 comments on commit e48b509

Please sign in to comment.