View Options

	diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb
	index 0c911bf..3132c36 100644
	--- a/lib/puppet/provider/vcsrepo/svn.rb
	+++ b/lib/puppet/provider/vcsrepo/svn.rb
	@@ -1,119 +1,113 @@
	require File.join(File.dirname(__FILE__), '..', 'vcsrepo')

	Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) do
	desc "Supports Subversion repositories"

	optional_commands :svn => 'svn',
	:svnadmin => 'svnadmin',
	:svnlook => 'svnlook'

	has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration

	def create
	if !@resource.value(:source)
	create_repository(@resource.value(:path))
	else
	checkout_repository(@resource.value(:source),
	@resource.value(:path),
	@resource.value(:revision))
	end
	update_owner
	end

	def working_copy_exists?
	if File.directory?(@resource.value(:path))
	- if File.directory?(File.join(@resource.value(:path), '.svn'))
	- return true
	- end
	- if svnlook('uuid',@resource.value(:path))
	- return true
	- end
	+ # :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))
	end
	- return false
	+ false
	end

	def exists?
	working_copy_exists?
	end

	def destroy
	FileUtils.rm_rf(@resource.value(:path))
	end

	def latest?
	at_path do
	- if self.revision < self.latest then
	- return false
	- else
	- return true
	- end
	+ self.revision >= self.latest
	end
	end

	def buildargs
	args = ['--non-interactive']
	if @resource.value(:basic_auth_username) && @resource.value(:basic_auth_password)
	args.push('--username', @resource.value(:basic_auth_username))
	args.push('--password', @resource.value(:basic_auth_password))
	args.push('--no-auth-cache')
	end

	if @resource.value(:force)
	args.push('--force')
	end

	if @resource.value(:configuration)
	args.push('--config-dir', @resource.value(:configuration))
	end

	- return args
	+ args
	end

	def latest
	args = buildargs.push('info', '-r', 'HEAD')
	at_path do
	svn(*args)[/^Last Changed Rev:\s+(\d+)/m, 1]
	end
	end

	def revision
	args = buildargs.push('info')
	at_path do
	svn(*args)[/^Last Changed Rev:\s+(\d+)/m, 1]
	end
	end

	def revision=(desired)
	args = buildargs.push('update', '-r', desired)
	at_path do
	svn(*args)
	end
	update_owner
	end

	private

	def checkout_repository(source, path, revision)
	args = buildargs.push('checkout')
	if revision
	args.push('-r', revision)
	end
	args.push(source, path)
	svn(*args)
	end

	def create_repository(path)
	args = ['create']
	if @resource.value(:fstype)
	args.push('--fs-type', @resource.value(:fstype))
	end
	args << path
	svnadmin(*args)
	end

	def update_owner
	if @resource.value(:owner) or @resource.value(:group)
	set_ownership
	end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Jul 4 2025, 10:35 AM (4 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3333482

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions