Merge pull request #23 from domcleal/tickets/master/5606

(#5606) Print Augeas' /augeas//error info to debug on save failure

1 files changed, 24 insertions, 5 deletions

diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
index 95142568e..76c7e7717 100644
--- a/lib/puppet/provider/augeas/augeas.rb
+++ b/lib/puppet/provider/augeas/augeas.rb
@@ -259,6 +259,18 @@ Puppet::Type.type(:augeas).provide(:augeas) do
     @aug.set("/augeas/save", mode)
   end
 
+  def print_put_errors
+    errors = @aug.match("/augeas//error[. = 'put_failed']")
+    debug("Put failed on one or more files, output from /augeas//error:") unless errors.empty?
+    errors.each do |errnode|
+      @aug.match("#{errnode}/*").each do |subnode|
+        sublabel = subnode.split("/")[-1]
+        subvalue = @aug.get(subnode)
+        debug("#{sublabel} = #{subvalue}")
+      end
+    end
+  end
+
   # Determines if augeas acutally needs to run.
   def need_to_run?
     force = resource[:force]
@@ -290,8 +302,13 @@ Puppet::Type.type(:augeas).provide(:augeas) do
           set_augeas_save_mode(SAVE_NEWFILE)
           do_execute_changes
           save_result = @aug.save
+          unless save_result
+            print_put_errors
+            fail("Save failed with return code #{save_result}, see debug")
+          end
+
           saved_files = @aug.match("/augeas/events/saved")
-          if save_result and saved_files.size > 0
+          if saved_files.size > 0
             root = resource[:root].sub(/^\/$/, "")
             saved_files.each do |key|
               saved_file = @aug.get(key).to_s.sub(/^\/files/, root)
@@ -305,13 +322,13 @@ Puppet::Type.type(:augeas).provide(:augeas) do
             debug("Files changed, should execute")
             return_value = true
           else
-            debug("Skipping because no files were changed or save failed")
+            debug("Skipping because no files were changed")
             return_value = false
           end
         end
       end
     ensure
-      if not return_value or resource.noop?
+      if not return_value or resource.noop? or not save_result
         close_augeas
       end
     end
@@ -337,8 +354,10 @@ Puppet::Type.type(:augeas).provide(:augeas) do
         debug("No saved files, re-executing augeas")
         set_augeas_save_mode(SAVE_OVERWRITE) if get_augeas_version >= "0.3.6"
         do_execute_changes
-        success = @aug.save
-        fail("Save failed with return code #{success}") if success != true
+        unless @aug.save
+          print_put_errors
+          fail("Save failed with return code #{success}, see debug")
+        end
       end
     ensure
       close_augeas