diff options
| author | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-26 15:27:20 -0800 |
|---|---|---|
| committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-26 15:49:52 -0800 |
| commit | 56f25d57dfa26de618416e9bdd4a853296ffcbc1 (patch) | |
| tree | 46a6c7e81c71f6b91e547cc49099da503658a6f3 /lib/puppet/type/vcsrepo.rb | |
| parent | 2295710e094ef849052e4b785819a1ba3a2c0fc6 (diff) | |
MODULES-1596 - Repository repeatedly destroyed/created with force
The `retrieve` method was calling `create` and `destroy` on every run
with `force => true`. Retrieve should not be making any changes to the
system, so removed that code, and updated `working_copy_exists` to make
sure that the directory not only contains a `.git` directory, but also
if `source` is specified it also matches `#{path}/.git/config` so that
it will overwrite a git repo with a different source.
Updated tests to not check for the old broken behavior. Added a regression test.
Diffstat (limited to 'lib/puppet/type/vcsrepo.rb')
| -rw-r--r-- | lib/puppet/type/vcsrepo.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index f678389..b8836d4 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -100,16 +100,6 @@ Puppet::Type.newtype(:vcsrepo) do prov = @resource.provider if prov if prov.working_copy_exists? - if @resource.value(:force) - if noop - notice "Noop Mode - Would have deleted repository and re-created from latest" - else - notice "Deleting current repository before recloning" - prov.destroy - notice "Create repository from latest" - prov.create - end - end (@should.include?(:latest) && prov.latest?) ? :latest : :present elsif prov.class.feature?(:bare_repositories) and prov.bare_exists? :bare |