From 8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sat, 9 Apr 2011 14:55:02 -0700 Subject: 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 Reviewed-by: Daniel Pittman --- lib/puppet/interface/face_collection.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') 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 -- cgit