diff options
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 14 | ||||
| -rw-r--r-- | lib/puppet/type.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/type/pfile.rb | 9 |
3 files changed, 10 insertions, 16 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index a666b4c7a..519d4aa0c 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -81,17 +81,11 @@ class Server return desc.join("\t") end - def handleignore(children, path, ignore) - - ignore.each { |ignore| - - ignored = [] - + def handleignore(children, path, ignore) + ignore.each { |ignore| Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match| - ignored.push(File.basename(match)) - } - - children = children - ignored + children.delete(File.basename(match)) + } } return children end diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 2fbcfff7f..88f3ff613 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -102,7 +102,6 @@ class Type < Puppet::Element @@metaparamdoc[:loglevel] = "Sets the level that information will be logged: debug, info, verbose, notice, warning, err, alert, emerg or crit" - @metaparams = [] #--------------------------------------------------------------- #--------------------------------------------------------------- # class methods dealing with Type management @@ -131,7 +130,7 @@ class Type < Puppet::Element # the Type class attribute accessors class << self - attr_reader :name, :namevar, :states, :validstates, :parameters, :metaparams + attr_reader :name, :namevar, :states, :validstates, :parameters end #--------------------------------------------------------------- diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index 403f6b4b7..8e5048662 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -163,7 +163,7 @@ module Puppet end unless FileTest.exists?(@parent.name) - Puppet.info "File %s does not exist" % @parent.name + Puppet.err "File %s does not exist" % @parent.name self.is = -1 return end @@ -941,11 +941,11 @@ module Puppet def handleignore(children) @parameters[:ignore].each { |ignore| - ignored = [] + ignored = [] Dir.glob(File.join(self.name,ignore), File::FNM_DOTMATCH) { |match| - ignored.push(File.basename(match)) + ignored.push(File.basename(match)) } - children = children - ignored + children = children - ignored } return children end @@ -953,6 +953,7 @@ module Puppet def initialize(hash) # clean out as many references to any file paths as possible # this was the source of many, many bugs + @arghash = self.argclean(hash) @arghash.delete(self.class.namevar) |