Skip to content

Commit e48b509

Browse files
author
Ashley Penney
committed
Merge pull request #815 from justinstoller/maint/master/dont-install-multiple-times
Call install_* methods only once in spec_helper_acceptance
2 parents 476c31a + 05370c2 commit e48b509

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44

55
unless ENV['RS_PROVISION'] == 'no'
6+
# This will install the latest available package on el and deb based
7+
# systems fail on windows and osx, and install via gem on other *nixes
8+
foss_opts = { :default_action => 'gem_install' }
9+
10+
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
11+
612
hosts.each do |host|
713
if host['platform'] =~ /debian/
814
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
915
end
10-
if host.is_pe?
11-
install_pe
12-
else
13-
install_puppet
14-
on host, "mkdir -p #{host['distmoduledir']}"
15-
end
16+
17+
on host, "mkdir -p #{host['distmoduledir']}"
1618
end
1719
end
1820

0 commit comments

Comments
 (0)