summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/log_paths.rb
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-01-05 15:54:00 -0800
committerNick Lewis <nick@puppetlabs.com>2011-01-05 15:54:00 -0800
commit19eb1e78e115d10bfb822e510213e4fab9cd2599 (patch)
treed5068dfd7a3890c7b5961779c87681b930cf3144 /lib/puppet/util/log_paths.rb
parentcc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4 (diff)
parent83ac3e789ddc8dbf40c93460032474870fb16c54 (diff)
downloadpuppet-19eb1e78e115d10bfb822e510213e4fab9cd2599.tar.gz
puppet-19eb1e78e115d10bfb822e510213e4fab9cd2599.tar.xz
puppet-19eb1e78e115d10bfb822e510213e4fab9cd2599.zip
Merge branch '2.6.next' into 2.6.x
Diffstat (limited to 'lib/puppet/util/log_paths.rb')
-rw-r--r--lib/puppet/util/log_paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb
index f59197ed1..2fefd4505 100644
--- a/lib/puppet/util/log_paths.rb
+++ b/lib/puppet/util/log_paths.rb
@@ -15,7 +15,7 @@ module Puppet::Util::LogPaths
descriptors[:tags] = tags
- [:path, :file, :line, :version].each do |param|
+ [:path, :file, :line].each do |param|
next unless value = send(param)
descriptors[param] = value
end