diff options
| author | James Turnbull <james@lovedthanlost.net> | 2012-05-12 21:34:59 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2012-05-12 21:34:59 -0700 |
| commit | 6453643104c9ff142677af562584555cc886c8d9 (patch) | |
| tree | 2adb81d27adc8b9cc30b9644b43987099664d5b4 /lib/puppet/provider | |
| parent | 1cc2c98efe923ac98151c59ee026057e664608dd (diff) | |
| parent | 0f362a13bfafdd14393bdd370e9d196540365837 (diff) | |
| download | puppet-vcsrepo-6453643104c9ff142677af562584555cc886c8d9.tar.gz puppet-vcsrepo-6453643104c9ff142677af562584555cc886c8d9.tar.bz2 | |
Merge pull request #18 from andihit/master
don't recreate bare repo if it exists already - fixes http://projects.puppetlabs.com/issues/12303
Diffstat (limited to 'lib/puppet/provider')
| -rw-r--r-- | lib/puppet/provider/vcsrepo/hg.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb index 54205c2..0be5e08 100644 --- a/lib/puppet/provider/vcsrepo/hg.rb +++ b/lib/puppet/provider/vcsrepo/hg.rb @@ -65,7 +65,10 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d def revision=(desired) at_path do - hg('pull') + begin + hg('pull') + rescue + end begin hg('merge') rescue Puppet::ExecutionFailure |