diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-04 18:24:24 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-04 18:24:24 +0000 |
| commit | 28cee40689440388994a4768bd301ae32c8ecc05 (patch) | |
| tree | c865ab44f4c9247052cf83de16ffc8ebe8b15e54 /lib/puppet/log.rb | |
| parent | e0e291332bd4676962a28c7b220ae5c5e9651c0a (diff) | |
| download | puppet-28cee40689440388994a4768bd301ae32c8ecc05.tar.gz puppet-28cee40689440388994a4768bd301ae32c8ecc05.tar.xz puppet-28cee40689440388994a4768bd301ae32c8ecc05.zip | |
Merging the changes from the override-refactor branch. This is a significant rewrite of the parser, but it has little affect on the rest of the code tree.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1726 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/log.rb')
| -rw-r--r-- | lib/puppet/log.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb index 0659042ce..c8d92e649 100644 --- a/lib/puppet/log.rb +++ b/lib/puppet/log.rb @@ -489,10 +489,8 @@ module Puppet # If they pass a source in to us, we make sure it is a string, and # we retrieve any tags we can. def source=(source) - # We can't store the actual source, we just store the path. This - # is a bit of a stupid hack, specifically testing for elements, but - # eh. - if source.is_a?(Puppet::Element) and source.respond_to?(:path) + # We can't store the actual source, we just store the path. + if source.respond_to?(:path) @objectsource = true @source = source.path else |