Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367870 )
Change subject: hiera: fix mwcache library
......................................................................
hiera: fix mwcache library
We erroneously removed a block reference that seemed unused.
Bug: T171712
Change-Id: I26f934a0c543cceff8a05c34dd0b9f650d9da465
---
M modules/wmflib/lib/hiera/mwcache.rb
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/wmflib/lib/hiera/mwcache.rb
b/modules/wmflib/lib/hiera/mwcache.rb
index 56f5575..e1acc6b 100644
--- a/modules/wmflib/lib/hiera/mwcache.rb
+++ b/modules/wmflib/lib/hiera/mwcache.rb
@@ -28,8 +28,8 @@
end
end
- def read(path, expected_type, default = nil, &_block)
- read_file(path, expected_type)
+ def read(path, expected_type, default = nil, &block)
+ read_file(path, expected_type, &block)
rescue Hiera::MediawikiPageNotFoundError => detail
# Any errors other than this will cause hiera to raise an error and
puppet to fail.
Hiera.debug("Page #{detail} is non-existent, setting defaults
#{default}")
@@ -40,7 +40,8 @@
raise error
end
- def read_file(path, expected_type = Object)
+ # rubocop: disable Lint/UnusedMethodArgument
+ def read_file(path, expected_type = Object, &block)
if stale?(path)
resp = get_from_mediawiki(path, true)
data = resp["*"]
@@ -53,6 +54,7 @@
@cache[path][:data]
end
+ # rubocop: enable Lint/Unusedmethodargument
private
--
To view, visit https://gerrit.wikimedia.org/r/367870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26f934a0c543cceff8a05c34dd0b9f650d9da465
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
