From 93b73f6877f9bdfdd291e2dd5ff5b8f6247d833d Mon Sep 17 00:00:00 2001 From: jonoterc Date: Tue, 14 Jan 2014 12:31:26 -0500 Subject: fix svnlook behavior with plain directories svnlook expects a sub-directory within a repository called "format"; when using svnlook within a non-repository directory this causes it to throw an error. Adding a test for that directory before executing svnlook. --- lib/puppet/provider/vcsrepo/svn.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/puppet/provider/vcsrepo') diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb index e0d5b21..7856acd 100644 --- a/lib/puppet/provider/vcsrepo/svn.rb +++ b/lib/puppet/provider/vcsrepo/svn.rb @@ -24,8 +24,10 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) if File.directory?(@resource.value(:path)) # :path is an svn checkout return true if File.directory?(File.join(@resource.value(:path), '.svn')) - # :path is an svn server - return true if svnlook('uuid', @resource.value(:path)) + if File.directory?(File.join(@resource.value(:path), 'format')) + # :path is an svn server + return true if svnlook('uuid', @resource.value(:path)) + end end false end -- cgit v1.2.3