Skip to content

Commit

Permalink
Merge pull request #502 from Andor/master
Browse files Browse the repository at this point in the history
remove git dependency from r10k::install::puppet_gem
  • Loading branch information
bastelfreak authored Oct 27, 2019
2 parents 3b9cf9e + 888870b commit 524be4a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion manifests/install/puppet_gem.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This class links the r10k binary for Puppet FOSS 4.2 and up
class r10k::install::puppet_gem {
require git

if versioncmp("${::puppetversion}", '4.2.0') >= 0 { #lint:ignore:only_variable_string
file { '/usr/bin/r10k':
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
}
end

it { is_expected.to contain_class('git') }
it { is_expected.not_to contain_class('git') }
it { is_expected.to contain_class('r10k::install::puppet_gem') }
it do
is_expected.to contain_package('r10k').with(
Expand Down

0 comments on commit 524be4a

Please sign in to comment.