diff options
author | Matthias Pigulla <mp@webfactory.de> | 2011-11-11 19:08:57 +0100 |
---|---|---|
committer | Matthias Pigulla <mp@webfactory.de> | 2011-11-11 19:27:12 +0100 |
commit | 5866bba816e54b6ed50f2827ffb2bfa4a951f93d (patch) | |
tree | ca47b2ce042ee3f616896c903e85355a425ae321 | |
parent | b5110938f5cb6736a13bbecbef4fbcaf6837ce56 (diff) | |
download | puppet-vcsrepo-5866bba816e54b6ed50f2827ffb2bfa4a951f93d.tar.gz puppet-vcsrepo-5866bba816e54b6ed50f2827ffb2bfa4a951f93d.tar.bz2 |
Fix (#10751) by adding a new "module" parameter for the CVS provider
-rw-r--r-- | lib/puppet/provider/vcsrepo/cvs.rb | 6 | ||||
-rw-r--r-- | lib/puppet/type/vcsrepo.rb | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb index fbe2eae..b4245bf 100644 --- a/lib/puppet/provider/vcsrepo/cvs.rb +++ b/lib/puppet/provider/vcsrepo/cvs.rb @@ -5,7 +5,7 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) commands :cvs => 'cvs' defaultfor :cvs => :exists - has_features :gzip_compression, :reference_tracking + has_features :gzip_compression, :reference_tracking, :modules def create if !@resource.value(:source) @@ -72,7 +72,9 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) # When the source: # * Starts with ':' (eg, :pserver:...) def module_name - if (source = @resource.value(:source)) + if (m = @resource.value(:module)) + m + elsif (source = @resource.value(:source)) source[0, 1] == ':' ? File.basename(source) : '.' end end diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb index 9bf8311..655549a 100644 --- a/lib/puppet/type/vcsrepo.rb +++ b/lib/puppet/type/vcsrepo.rb @@ -22,6 +22,9 @@ Puppet::Type.newtype(:vcsrepo) do feature :ssh_identity, "The provider supports a configurable SSH identity file" + feature :modules, + "The repository contains modules that can be chosen of" + ensurable do attr_accessor :latest @@ -148,4 +151,8 @@ Puppet::Type.newtype(:vcsrepo) do newparam :identity, :required_features => [:ssh_identity] do desc "SSH identity file" end + + newparam :module, :required_features => [:modules] do + desc "The repository module to manage" + end end |