Merge pull request #69 from ripienaar/68

(#68) fix inverted logic in on_error and on_success
choria-io · May 18, 2018 · 44a621a · 44a621a
2 parents 5cdc0d9 + 7e367ed
commit 44a621a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/puppet/functions/choria/on_error.rb b/lib/puppet/functions/choria/on_error.rb
@@ -48,7 +48,7 @@
   end
 
   def handler(results)
-    if results.is_a?(MCollective::Util::BoltSupport::TaskResults) && results.error_set.empty && !results.exception
+    if results.is_a?(MCollective::Util::BoltSupport::TaskResults) && (!results.error_set.empty || results.exception)
       yield(results)
     end
 

diff --git a/lib/puppet/functions/choria/on_success.rb b/lib/puppet/functions/choria/on_success.rb
@@ -48,7 +48,7 @@
   end
 
   def handler(results)
-    if results.is_a?(MCollective::Util::BoltSupport::TaskResults) && (!results.error_set.empty || results.exception)
+    if results.is_a?(MCollective::Util::BoltSupport::TaskResults) && (results.error_set.empty && !results.exception)
       yield(results)
     end