diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2011-04-09 14:55:02 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@puppetlabs.com> | 2011-04-09 19:31:27 -0700 |
| commit | 8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353 (patch) | |
| tree | 8eb1c24021fb7fdd96c987b0a19fb61475f73c03 /lib | |
| parent | ab4050d73cc735f4d2c48f90d103291f7caa7703 (diff) | |
| download | puppet-8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353.tar.gz puppet-8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353.tar.xz puppet-8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353.zip | |
Fixing FaceCollection#faces
We were still looking for faces in version
directories.
No changes to testing because the current test is pending.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/interface/face_collection.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/interface/face_collection.rb b/lib/puppet/interface/face_collection.rb index 9f7a499c2..84296582c 100644 --- a/lib/puppet/interface/face_collection.rb +++ b/lib/puppet/interface/face_collection.rb @@ -12,9 +12,7 @@ module Puppet::Interface::FaceCollection $LOAD_PATH.each do |dir| next unless FileTest.directory?(dir) Dir.chdir(dir) do - # REVISIT: This is wrong!!!! We don't name files like that ever, - # so we should no longer match things like this. Damnit!!! --daniel 2011-04-07 - Dir.glob("puppet/faces/v*/*.rb").collect { |f| f.sub(/\.rb/, '') }.each do |file| + Dir.glob("puppet/faces/*.rb").collect { |f| f.sub(/\.rb/, '') }.each do |file| iname = file.sub(/\.rb/, '') begin require iname |