Fixing users so that they can use a group created by Puppet, and they also now autorequire that group. To do so, I modified Puppet::Util.gid, which required that I fix Puppet::Type#merge to support merging managed and umanaged objects, which required fixing a bug in Puppet::Type#managed?, and I also changed the ensure state to only default to a value, when the object is managed, which required that I change the defaults system to support default procs that do not return a value. In other words, lots of fixes for a smallish problem, but we are much better off now.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@912 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index a3a935b00..25789e9af 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -16,9 +16,9 @@ module Puppet
             end
 
             def nodefault
-                undef_method :default
-                #if defined_method? :default
-                #end
+                if public_method_defined? :default
+                    undef_method :default
+                end
             end
 
             # Store documentation for this parameter.
@@ -42,6 +42,9 @@ module Puppet
                         Puppet.debug "Reraising %s" % detail
                         raise
                     rescue => detail
+                        if Puppet[:debug]
+                            puts detail.backtrace
+                        end
                         raise Puppet::DevError, "Munging failed for class %s: %s" %
                             [self.name, detail]
                     end