Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/311025
Change subject: labs: Fix httpyaml backend for precise puppetmasters ...................................................................... labs: Fix httpyaml backend for precise puppetmasters Apparently ruby version on precise doesn't like two params with the same name Change-Id: Ia3ed8f776955149ed0aab316f692b9a11679e8bd --- M .rubocop_todo.yml M modules/wmflib/lib/hiera/httpcache.rb 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/311025/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d8b190f..42e8e96 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -30,8 +30,8 @@ # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods. Lint/UnusedMethodArgument: Exclude: - - 'modules/wmflib/lib/hiera/backend/role_backend.rb' - - 'modules/wmflib/lib/hiera/mwcache.rb' + - 'modules/wmflib/lib/hiera/backend/*_backend.rb' + - 'modules/wmflib/lib/hiera/*cache.rb' # Offense count: 10 Lint/UselessAssignment: diff --git a/modules/wmflib/lib/hiera/httpcache.rb b/modules/wmflib/lib/hiera/httpcache.rb index 1c6abb5..70a65f8 100644 --- a/modules/wmflib/lib/hiera/httpcache.rb +++ b/modules/wmflib/lib/hiera/httpcache.rb @@ -18,7 +18,7 @@ end end - def read(path, _=nil, _=nil) + def read(path, expected_type=Hash, default=nil) read_file(path) rescue => detail # When failing to read data, we raise an exception, see https://phabricator.wikimedia.org/T78408 -- To view, visit https://gerrit.wikimedia.org/r/311025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3ed8f776955149ed0aab316f692b9a11679e8bd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits