Fixing configuration storage -- there was a check being done that caused false values to get converted to nil values, which failed in the database

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

2 files changed, 12 insertions, 11 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 8657ac0af..fe8e17084 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -683,10 +683,6 @@ class Puppet::Parser::Interpreter
         return @scope
     end
 
-    # Iteratively make sure that every object in the scope tree is translated.
-    def translate(scope)
-    end
-
     private
 
     # Check whether any of our files have changed.
@@ -777,11 +773,18 @@ class Puppet::Parser::Interpreter
                 end
             }
         else
-            # We store all of the objects, even the collectable ones
-            benchmark(:info, "Stored configuration for #{hash[:name]}") do
-                Puppet::Rails::Host.transaction do
-                    Puppet::Rails::Host.store(hash)
+            begin
+                # We store all of the objects, even the collectable ones
+                benchmark(:info, "Stored configuration for #{hash[:name]}") do
+                    Puppet::Rails::Host.transaction do
+                        Puppet::Rails::Host.store(hash)
+                    end
+                end
+            rescue => detail
+                if Puppet[:trace]
+                    puts detail.backtrace
                 end
+                Puppet.err "Could not store configs: %s" % detail.to_s
             end
         end
 
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index 600e44781..023e4e75d 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -19,9 +19,7 @@ class Puppet::Parser::Resource::Param
     def store(resource)
         args = {}
         [:name, :value, :line, :file].each do |var|
-            if val = self.send(var)
-                args[var] = val
-            end
+            args[var] = self.send(var)
         end
         args[:name] = args[:name].to_s
         if obj = resource.rails_parameters.find_by_name(self.name)