[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[nfagerlund]

The following commit has been merged in the upstream branch:
commit 86a2a0031fdad032003d053244a3baa04c8f2b81
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Tue Jan 25 17:50:17 2011 -0800

    (#5944) Remove documentation of define() when used on nodes, as it is not a supported use of this function.
    
    Final patch in this series reviewed by Dan Bode.

diff --git a/lib/puppet/parser/functions/defined.rb b/lib/puppet/parser/functions/defined.rb
index deb57a6..2aeaa9b 100644
--- a/lib/puppet/parser/functions/defined.rb
+++ b/lib/puppet/parser/functions/defined.rb
@@ -1,8 +1,8 @@
 # Test whether a given class or definition is defined
 Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Determine whether
-  a given type or class is defined. This function can also determine whether a
+  a given class or resource type is defined. This function can also determine whether a
   specific resource has been declared. Returns true or false. Accepts class names,
-  type names, resource references, and node references.
+  type names, and resource references.
 
   The `defined` function checks both native and defined types, including types
   provided as plugins via modules. Types and classes are both checked using their names:
@@ -26,25 +26,7 @@ Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Dete
 
   However, this order requirement refers to parse order only, and ordering of
   resources in the configuration graph (e.g. with `before` or `require`) does not
-  affect the behavior of `defined`.
-
-  You can also use `defined` to check whether a node is declared using syntax
-  resembling a resource reference, like `Node[\"testnode.domain.com\"]`. This usage
-  is not necessarily recommended, and is included here only in the spirit of
-  completeness. Note that:
-
-  * Only the node whose configuration is being compiled is considered declared;
-  the `define` function will not return information about definitions not currently
-  being used.
-  * Node definitions inherited by the current node are considered declared;
-  however, the default node is never considered declared.
-  * A node is not considered declared simply by virtue of receiving a
-  configuration; it must have matched a node definition in the manifest.
-  * The name used in the node reference must match the name used in the node
-  definition, even if this is not the node's actual certname.
-  * Regular expression node definitions cannot be checked for declaration using
-  `define`, nor can `define` be used to introspect information returned by an
-  external node classifier.") do |vals|
+  affect the behavior of `defined`.") do |vals|
     result = false
     vals = [vals] unless vals.is_a?(Array)
     vals.each do |val|

-- 
Puppet packaging for Debian