Hopefully *finally* fixed the "already being managed" problem

(#1036).  The problem only cropped up if there was a failure
when trying to manage the system -- this would cause the
setting-based resources not to get cleaned up.

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 6e0b4b66d..366688944 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -669,14 +669,17 @@ Generated on #{Time.now}.
 
             bucket = to_transportable(*sections)
 
-            config = bucket.to_catalog
-            config.host_config = false
-            config.apply do |transaction|
-                if failures = transaction.any_failed?
-                    raise "Could not configure for running; got %s failure(s)" % failures
+            begin
+                config = bucket.to_catalog
+                config.host_config = false
+                config.apply do |transaction|
+                    if failures = transaction.any_failed?
+                        raise "Could not configure for running; got %s failure(s)" % failures
+                    end
                 end
+            ensure
+                config.clear
             end
-            config.clear
 
             sections.each { |s| @used << s }
             @used.uniq