Merge pull request #757 from zekefast/issue_756_fix_to_error_level_option_does_not_work

rodjek · web-flow · commit 415afedfa868 · 2017-09-28T13:09:29.000+10:00
Fix setup of default log_format in PuppetLink.configuration when it is empty.
diff --git a/lib/puppet-lint.rb b/lib/puppet-lint.rb
@@ -89,7 +89,7 @@ def file=(path)
   #
   # Returns a format String to be used with String#%.
   def log_format
-    if configuration.log_format == ''
+    if configuration.log_format.nil? || configuration.log_format.empty?
       ## recreate previous old log format as far as thats possible.
       format = '%{KIND}: %{message} on line %{line}'
       format.prepend('%{path} - ') if configuration.with_filename

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ def file=(path)`
`89`	`89`	`#`
`90`	`90`	`# Returns a format String to be used with String#%.`
`91`	`91`	`def log_format`
`92`		`- if configuration.log_format == ''`
	`92`	`+ if configuration.log_format.nil? \|\| configuration.log_format.empty?`
`93`	`93`	`## recreate previous old log format as far as thats possible.`
`94`	`94`	`format = '%{KIND}: %{message} on line %{line}'`
`95`	`95`	`format.prepend('%{path} - ') if configuration.with_filename`