diff options
| author | TP Honey <tphoney@users.noreply.github.com> | 2015-03-30 10:36:42 +0100 |
|---|---|---|
| committer | TP Honey <tphoney@users.noreply.github.com> | 2015-03-30 10:36:42 +0100 |
| commit | 3d4547646d49295c91bb002fa885e187c2d89feb (patch) | |
| tree | 922b733d6dcd048e6069bc4bbf05a64606fd8c14 /lib/puppet/provider/vcsrepo | |
| parent | 74e415866ef2d39ed1568dd43b6e8596590dedaf (diff) | |
| parent | 7fdfa1b4047e134053f6df95f414cb3fc44796cd (diff) | |
| download | puppet-vcsrepo-3d4547646d49295c91bb002fa885e187c2d89feb.tar.gz puppet-vcsrepo-3d4547646d49295c91bb002fa885e187c2d89feb.tar.bz2 | |
Merge pull request #220 from ddisisto/1.2.x_add_svn_accept
Add support for 'conflict' parameter to populate svn --accept arg
Diffstat (limited to 'lib/puppet/provider/vcsrepo')
| -rw-r--r-- | lib/puppet/provider/vcsrepo/svn.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb index a1b1714..905d5ad 100644 --- a/lib/puppet/provider/vcsrepo/svn.rb +++ b/lib/puppet/provider/vcsrepo/svn.rb @@ -7,7 +7,7 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) :svnadmin => 'svnadmin', :svnlook => 'svnlook' - has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration + has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration, :conflict def create if !@resource.value(:source) @@ -92,6 +92,11 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) else buildargs.push('update', '-r', desired) end + + if @resource.value(:conflict) + args.push('--accept', @resource.value(:conflict)) + end + at_path do svn(*args) end |