diff options
| author | shafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-14 22:37:57 +0000 |
|---|---|---|
| committer | shafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-14 22:37:57 +0000 |
| commit | 2a6710b22d8cfd1d5a64af320e8b7d2ff9a998cc (patch) | |
| tree | 5293176e8248ba4e8ef8c7462ae35932d944f610 | |
| parent | ec6603468abad8e0fac3960d778b44019dd63644 (diff) | |
| download | puppet-2a6710b22d8cfd1d5a64af320e8b7d2ff9a998cc.tar.gz puppet-2a6710b22d8cfd1d5a64af320e8b7d2ff9a998cc.tar.xz puppet-2a6710b22d8cfd1d5a64af320e8b7d2ff9a998cc.zip | |
fileserver still has a bug
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@660 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet/type/pfile.rb | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index 07b6699db..507cacf6a 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -1017,36 +1017,6 @@ module Puppet #make local copy of arguments args = @arghash.dup - #check if ignored - match_ignore = false; - if args.include?(:ignore) - ignore = args[:ignore] - - ignore.each { |pattern| - - #make sure we got strings - unless pattern.is_a?(String) - raise Puppet::DevError.new( - "If Ignore is an Array it must contain strings of patterns") - end - - #try to match the pattern - match = Regexp.new(pattern.split("*").join("\/*")) - - if match =~ path - match_ignore = true - break - end - - } - - #if the patten is matched return no child - if match_ignore - return nil - end - - end - if path =~ %r{^#{File::SEPARATOR}} raise Puppet::DevError.new( "Must pass relative paths to PFile#newchild()" @@ -1247,6 +1217,7 @@ module Puppet #Puppet.warning "Listing path %s" % path.inspect desc = server.list(path, r, ignore) + puts desc desc.split("\n").each { |line| file, type = line.split("\t") next if file == "/" |