[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

Daniel Pittman daniel at puppetlabs.com
Tue May 10 08:17:35 UTC 2011


The following commit has been merged in the experimental branch:
commit 03bd5595365b7d541d20ed614e9c8be6a7cba9c9
Author: Daniel Pittman <daniel at puppetlabs.com>
Date:   Thu Apr 21 10:38:25 2011 -0700

    maint: more robust listing of valid faces.
    
    We used to treat anything with a top level key in the faces hash as a valid
    face; it makes more sense to filter that only to things that have at least one
    implementation.
    
    Previously we had to be super-careful not to accidentally touch the top level
    for an invalid face, which set us up for future failure when someone wasn't
    careful enough; now we can cope with that.
    
    Paired-With: Max Martin <max at puppetlabs.com>

diff --git a/lib/puppet/interface/face_collection.rb b/lib/puppet/interface/face_collection.rb
index 591471d..49e007e 100644
--- a/lib/puppet/interface/face_collection.rb
+++ b/lib/puppet/interface/face_collection.rb
@@ -24,7 +24,7 @@ module Puppet::Interface::FaceCollection
         end
       end
     end
-    return @faces.keys
+    return @faces.keys.select {|name| @faces[name].length > 0 }
   end
 
   def self.validate_version(version)

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list