Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/347827 )

Change subject: wmflib: add some information to failures of conftool
......................................................................


wmflib: add some information to failures of conftool

Change-Id: I7665f7458f7d982fabaef46600c484da163d5145
---
M modules/wmflib/lib/puppet/parser/functions/conftool.rb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/wmflib/lib/puppet/parser/functions/conftool.rb 
b/modules/wmflib/lib/puppet/parser/functions/conftool.rb
index 867ad1e..f3c9ce5 100644
--- a/modules/wmflib/lib/puppet/parser/functions/conftool.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/conftool.rb
@@ -53,8 +53,8 @@
         result.push({'name' => obj_name, 'tags' => tags, 'value' => 
entry[obj_name]})
       end
       result
-    rescue
-      raise Puppet::ParseError, "Unable to read data from conftool"
+    rescue StandardError => e
+      raise Puppet::ParseError, "Unable to read data from conftool. Wrapped 
error is #{e}: #{e.message}"
     end
   end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/347827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7665f7458f7d982fabaef46600c484da163d5145
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to