summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-27 18:46:45 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-27 18:46:45 +0000
commit506269fdfddbf04acd113299496f2f2c6b79b662 (patch)
tree856c88ab34ba3408a45657152d76447626226246
parent76859574c36761db81a25283d759edfcc591cf84 (diff)
downloadpuppet-506269fdfddbf04acd113299496f2f2c6b79b662.tar.gz
puppet-506269fdfddbf04acd113299496f2f2c6b79b662.tar.xz
puppet-506269fdfddbf04acd113299496f2f2c6b79b662.zip
adding hooks for ignoring files in the plugins directory, and defaulting to ignoring cvs and svn files
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1320 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/client/master.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index ee687cd3e..4a4541e7c 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -28,7 +28,9 @@ class Puppet::Client::MasterClient < Puppet::Client
is used for retrieval, so anything that is a valid file source can
be used here."],
:pluginsync => [false,
- "Whether plugins should be synced with the central server."]
+ "Whether plugins should be synced with the central server."],
+ :pluginsignore => [".svn CVS",
+ "What files to ignore when pulling down plugins.."]
)
@drivername = :Master
@@ -439,7 +441,9 @@ class Puppet::Client::MasterClient < Puppet::Client
plugins.push Puppet::Type.type(:file).create(
:path => Puppet[:pluginpath],
:recurse => true,
- :source => Puppet[:pluginsource]
+ :source => Puppet[:pluginsource],
+ :ignore => Puppet[:pluginsignore].split(/\s+/),
+ :tag => "plugins"
)
trans = plugins.evaluate