From c9bcd68953fdf060ab0e0e1ad82c850157f89540 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Sun, 26 Feb 2012 18:15:10 +0100 Subject: don't recreate bare repo if it exists already (fixes #12303) --- lib/puppet/type/vcsrepo.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index 9824726..2792cfe 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -40,6 +40,8 @@ Puppet::Type.newtype(:vcsrepo) do else return false end + when :bare + return is == :bare end end @@ -48,7 +50,9 @@ Puppet::Type.newtype(:vcsrepo) do end newvalue :bare, :required_features => [:bare_repositories] do - provider.create + if !provider.exists? + provider.create + end end newvalue :absent do -- cgit v1.2.3 From 0f362a13bfafdd14393bdd370e9d196540365837 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Sun, 18 Mar 2012 17:26:54 +0100 Subject: add begin/except for hg pull (mercurial 2.1 returns 1 for hg pull when no changes are found; this change gets reverted in mercurial 2.1.1) --- lib/puppet/provider/vcsrepo/hg.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3