BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/202985
Change subject: Fix puppet-lint configuration to exclude submodules ...................................................................... Fix puppet-lint configuration to exclude submodules Fix the code to find and exclude submodule paths from puppet-lint runs to work with puppet-lint 1.1.0. See https://github.com/rodjek/puppet-lint/issues/331 Change-Id: Ife56a7f6ff102a22e476c513beb2fe8a34f767cc --- M Rakefile 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/85/202985/1 diff --git a/Rakefile b/Rakefile index b6d13ea..792eb65 100644 --- a/Rakefile +++ b/Rakefile @@ -4,12 +4,14 @@ # require 'puppet-lint/tasks/puppet-lint' -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_class_parameter_defaults') -PuppetLint.configuration.send('disable_autoloader_layout') - -gitmodules = File.expand_path '../.gitmodules', __FILE__ - -PuppetLint.configuration.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) { "#{$1}/**/*.pp" } +# Work around bug in puppet-lint configuration +# https://github.com/rodjek/puppet-lint/issues/331 +Rake::Task[:lint].clear +PuppetLint::RakeTask.new :lint do |config| + gitmodules = File.expand_path '../.gitmodules', __FILE__ + config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) { "#{$1}/**/*.pp" } + config.disable_checks = [ '80chars', 'class_parameter_defaults', 'autoloader_layout' ] + config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}' +end task :default => [:lint] -- To view, visit https://gerrit.wikimedia.org/r/202985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife56a7f6ff102a22e476c513beb2fe8a34f767cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <bda...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
