diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-29 20:16:28 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-29 20:16:28 +0000 |
| commit | 526deef2c44ac66edce85e18257f5341bd4ecb9c (patch) | |
| tree | 789e7012f50a95c65cc9ef81eec1353bf9ab0206 /lib/puppet/log.rb | |
| parent | 9e1c63a652f9b86af40c7de198f877bc09ad1c62 (diff) | |
| download | puppet-526deef2c44ac66edce85e18257f5341bd4ecb9c.tar.gz puppet-526deef2c44ac66edce85e18257f5341bd4ecb9c.tar.xz puppet-526deef2c44ac66edce85e18257f5341bd4ecb9c.zip | |
Fixed merging of state values, but I have not yet solved merging of parameter or metaparam values, since they are quite different.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@735 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/log.rb')
| -rw-r--r-- | lib/puppet/log.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb index 62fe98fdf..7c30e88b5 100644 --- a/lib/puppet/log.rb +++ b/lib/puppet/log.rb @@ -167,10 +167,10 @@ module Puppet # :nodoc: # cannot log a message with a '%' in it. So, we get rid # of them. if msg.source == "Puppet" - dest.send(msg.level, msg.to_s.gsub("%", '')) + dest.send(msg.level, msg.to_s.gsub("%", '%%')) else dest.send(msg.level, "(%s) %s" % - [msg.source.to_s.gsub("%", ""), msg.to_s.gsub("%", '')] + [msg.source.to_s.gsub("%", ""), msg.to_s.gsub("%", '%%')] ) end when File: |