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

[Jesse Wolfe]

The following commit has been merged in the experimental branch:
commit 9e66daa27ce65028f48dd13c67e066d3cc2c766a
Merge: 9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 cad1e0f69ca19b37901f7f289444feae8f9ebd34
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Sep 13 23:34:06 2010 -0700

    Merge commit '2.6.1' into next

diff --combined lib/puppet/resource/type.rb
index c9ff323,7b21e55..3edf286
--- a/lib/puppet/resource/type.rb
+++ b/lib/puppet/resource/type.rb
@@@ -13,8 -13,8 +13,8 @@@ class Puppet::Resource::Typ
  
    RESOURCE_SUPERTYPES = [:hostclass, :node, :definition]
  
 -  attr_accessor :file, :line, :doc, :code, :ruby_code, :parent, :resource_type_collection, :module_name
 -  attr_reader :type, :namespace, :arguments, :behaves_like
 +  attr_accessor :file, :line, :doc, :code, :ruby_code, :parent, :resource_type_collection
 +  attr_reader :type, :namespace, :arguments, :behaves_like, :module_name
  
    RESOURCE_SUPERTYPES.each do |t|
      define_method("#{t}?") { self.type == t }
@@@ -92,8 -92,6 +92,8 @@@
      end
  
      set_arguments(options[:arguments])
 +
 +    @module_name = options[:module_name]
    end
  
    # This is only used for node names, and really only when the node name
@@@ -235,8 -233,13 +235,13 @@@
        resource[param] = value
      end
  
-     scope.setvar("title", resource.title) unless set.include? :title
-     scope.setvar("name", resource.name.to_s.downcase) unless set.include? :name
+     if @type == :hostclass
+       scope.setvar("title", resource.title.to_s.downcase) unless set.include? :title
+       scope.setvar("name",  resource.name.to_s.downcase ) unless set.include? :name
+     else
+       scope.setvar("title", resource.title              ) unless set.include? :title
+       scope.setvar("name",  resource.name               ) unless set.include? :name
+     end
      scope.setvar("module_name", module_name) if module_name and ! set.include? :module_name
  
      if caller_name = scope.parent_module_name and ! set.include?(:caller_module_name)

-- 
Puppet packaging for Debian