summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErnesto Ruy Sanchez <ernesto@cyphergenomics.com>2015-01-30 10:46:59 -0800
committerErnesto Ruy Sanchez <ernesto@cyphergenomics.com>2015-01-30 10:46:59 -0800
commitcf5c8e6e9fb46115d59ec4e3b5d433e29168fe00 (patch)
tree4ada119c270962be0b00e82faf4f3d4e4af42061 /lib
parent56e2795091b153cf7ef175f2441a43cc9c315d91 (diff)
downloadpuppet-vcsrepo-cf5c8e6e9fb46115d59ec4e3b5d433e29168fe00.tar.gz
puppet-vcsrepo-cf5c8e6e9fb46115d59ec4e3b5d433e29168fe00.tar.bz2
Added submodules true condition before update_submodules on revision method
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/vcsrepo/git.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 9d3f7f3..e31a76c 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -20,7 +20,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
if @resource.value(:revision)
checkout
end
- if @resource.value(:ensure) != :bare && @resource.value(:submodules) == :true
+ if @resource.value(:ensure) != :bare && @resource.value(:submodules) == :true && @resource.value(:submodules) == :true
update_submodules
end
@@ -75,7 +75,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") }
end
#TODO Would this ever reach here if it is bare?
- if @resource.value(:ensure) != :bare
+ if @resource.value(:ensure) != :bare && @resource.value(:submodules) == :true
update_submodules
end
update_owner_and_excludes