From cb791664568ba4093ab296de190ed470124d1f54 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Thu, 18 Oct 2012 14:57:15 -0700 Subject: Add a dummy provider, remove 'defaultfor' from all other providers. Resolves warning about multiple default providers for :vcsrepo. --- lib/puppet/provider/vcsrepo/bzr.rb | 1 - lib/puppet/provider/vcsrepo/cvs.rb | 1 - lib/puppet/provider/vcsrepo/dummy.rb | 7 +++++++ lib/puppet/provider/vcsrepo/git.rb | 1 - lib/puppet/provider/vcsrepo/hg.rb | 1 - lib/puppet/provider/vcsrepo/svn.rb | 1 - 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 lib/puppet/provider/vcsrepo/dummy.rb diff --git a/lib/puppet/provider/vcsrepo/bzr.rb b/lib/puppet/provider/vcsrepo/bzr.rb index 3a93e35..8b10cab 100644 --- a/lib/puppet/provider/vcsrepo/bzr.rb +++ b/lib/puppet/provider/vcsrepo/bzr.rb @@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:bzr, :parent => Puppet::Provider::Vcsrepo) desc "Supports Bazaar repositories" optional_commands :bzr => 'bzr' - defaultfor :bzr => :exists has_features :reference_tracking def create diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb index 85178f1..21485d3 100644 --- a/lib/puppet/provider/vcsrepo/cvs.rb +++ b/lib/puppet/provider/vcsrepo/cvs.rb @@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) desc "Supports CVS repositories/workspaces" optional_commands :cvs => 'cvs' - defaultfor :cvs => :exists has_features :gzip_compression, :reference_tracking, :modules def create diff --git a/lib/puppet/provider/vcsrepo/dummy.rb b/lib/puppet/provider/vcsrepo/dummy.rb new file mode 100644 index 0000000..f76e090 --- /dev/null +++ b/lib/puppet/provider/vcsrepo/dummy.rb @@ -0,0 +1,7 @@ +require File.join(File.dirname(__FILE__), '..', 'vcsrepo') + +Puppet::Type.type(:vcsrepo).provide(:dummy, :parent => Puppet::Provider::Vcsrepo) do + desc "Dummy default provider" + + defaultfor :vcsrepo => :dummy +end diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 95115c6..9254243 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -6,7 +6,6 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) ##TODO modify the commands below so that the su - is included optional_commands :git => 'git', :su => 'su' - defaultfor :git => :exists has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user def create diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb index 0be5e08..67a2a82 100644 --- a/lib/puppet/provider/vcsrepo/hg.rb +++ b/lib/puppet/provider/vcsrepo/hg.rb @@ -4,7 +4,6 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d desc "Supports Mercurial repositories" optional_commands :hg => 'hg' - defaultfor :hg => :exists has_features :reference_tracking def create diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb index bd420b5..bf21813 100644 --- a/lib/puppet/provider/vcsrepo/svn.rb +++ b/lib/puppet/provider/vcsrepo/svn.rb @@ -6,7 +6,6 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) optional_commands :svn => 'svn', :svnadmin => 'svnadmin' - defaultfor :svn => :exists has_features :filesystem_types, :reference_tracking, :basic_auth def create -- cgit v1.2.3