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

1 files changed, 11 insertions, 8 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