diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2013-09-04 11:15:02 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2013-09-04 11:15:02 -0700 |
| commit | 0eeb6501b1b2ea84c38b0d4464ac42c12c4e9fa7 (patch) | |
| tree | c26854c256da1f671dae965bb37600ac1c605aed /lib/puppet/provider/vcsrepo | |
| parent | f49f3fe075c1b0fbb905f09066ae17cebc51cc83 (diff) | |
| parent | e69c6eac89fbbbd5c459388eef30b1320ab9d826 (diff) | |
Merge pull request #91 from jiacona/master
update git provider to handle checking out into an existing (empty) dir
Diffstat (limited to 'lib/puppet/provider/vcsrepo')
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 58330f6..47e84d2 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -147,7 +147,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) end def check_force - if path_exists? + if path_exists? and not path_empty? if @resource.value(:force) notice "Removing %s to replace with vcsrepo." % @resource.value(:path) destroy |