[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 835f73c72f2a7a4196633de9821a5e2cc11c1302
Author: Bryan Kearney <bkearney at redhat.com>
Date:   Thu Jul 1 16:39:09 2010 -0400

    Use the name in the search path for looking for metadata

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 9923713..34c84f7 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -365,6 +365,7 @@ class Puppet::Util::Settings
         # and I'm too lazy to only set the metadata once.
         searchpath.reverse.each do |source|
             source = run_mode if source == :run_mode
+            source = @name if (@name && source == :name)
             if meta = metas[source]
                 set_metadata(meta)
             end

-- 
Puppet packaging for Debian