diff options
| author | Markus Roberts <Markus@reality.com> | 2009-10-31 12:13:55 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-11-05 18:56:55 +1100 |
| commit | b8470b8064503baea21d43d5c1dcf349bc4daf59 (patch) | |
| tree | efea7a9ac5bd5d16665d1c8ac1b4b568dd95799a /lib/puppet/external | |
| parent | 5b750c225ff0c646341282aa867d92dbe15509cd (diff) | |
| download | puppet-b8470b8064503baea21d43d5c1dcf349bc4daf59.tar.gz puppet-b8470b8064503baea21d43d5c1dcf349bc4daf59.tar.xz puppet-b8470b8064503baea21d43d5c1dcf349bc4daf59.zip | |
Fix #2757 & CSR 92 (symlinks in recursively managed dirs)
The fundemental problem was that, despite what the comment said,
the early bailout for file content management only applied to
directories, not to links. Making links bail out at as well fixed
the problem for most users.
However, it would still occur for users with mixed ruby version
system since there were no to_/from_pson methods for file metadata.
So the second (and far larger) part of this patch adds metadata
pson support.
The testing is unit level only, as there's no pratical way to do
the cross-ruby-version acceptance testing and no benifit to doing
"integration" testing short of that.
Signed-off-by: Markus Roberts <Markus@reductivelabs.com>
Diffstat (limited to 'lib/puppet/external')
| -rw-r--r-- | lib/puppet/external/pson/common.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/external/pson/common.rb b/lib/puppet/external/pson/common.rb index 71b85ce54..87bce988b 100644 --- a/lib/puppet/external/pson/common.rb +++ b/lib/puppet/external/pson/common.rb @@ -48,7 +48,7 @@ module PSON case when c.empty? then p when p.const_defined?(c) then p.const_get(c) - else raise ArgumentError, "can't find const #{path}" + else raise ArgumentError, "can't find const for unregistered document type #{path}" end end end |