Skip to content

Commit

Permalink
Merge pull request #347 from mhaskel/aio_fix
Browse files Browse the repository at this point in the history
check for nil
  • Loading branch information
bmjen committed Jun 22, 2015
2 parents b36f071 + 967880f commit 47359c3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions spec/acceptance/concat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
groupname = 'system'
scriptname = 'concatfragments.rb'
vardir = default['puppetvardir']
if vardir == ''
if vardir.nil? or vardir == ''
vardir = '/opt/puppetlabs/puppet/cache'
end
when 'Darwin'
username = 'root'
groupname = 'wheel'
scriptname = 'concatfragments.rb'
vardir = default['puppetvardir']
if vardir == ''
if vardir.nil? or vardir == ''
vardir = '/opt/puppetlabs/puppet/cache'
end
when 'windows'
Expand All @@ -28,15 +28,15 @@
groupname = 'root'
scriptname = 'concatfragments.rb'
vardir = default['puppetvardir']
if vardir == ''
if vardir.nil? or vardir == ''
vardir = '/opt/puppetlabs/puppet/cache'
end
else
username = 'root'
groupname = 'root'
scriptname = 'concatfragments.rb'
vardir = default['puppetvardir']
if vardir == ''
if vardir.nil? or vardir == ''
vardir = '/opt/puppetlabs/puppet/cache'
end
end
Expand Down

0 comments on commit 47359c3

Please sign in to comment.