diff options
author | Markus Roberts <Markus@reality.com> | 2009-12-18 13:40:29 -0800 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-12-20 09:13:55 +1100 |
commit | e9a0cb7a28a34fd04db4bfe1db347da5d774f2e8 (patch) | |
tree | 69201d8414c255c3c7eb685f2701e48943a6f715 /lib/puppet/application/puppetrun.rb | |
parent | 727ee72b12125223b5d0d0704dc35f5c71a1a04e (diff) | |
download | puppet-e9a0cb7a28a34fd04db4bfe1db347da5d774f2e8.tar.gz puppet-e9a0cb7a28a34fd04db4bfe1db347da5d774f2e8.tar.xz puppet-e9a0cb7a28a34fd04db4bfe1db347da5d774f2e8.zip |
Fix for #2657 (retain old setting if config has syntax error)
This appears to be regression introduced by threading changes. The fix was
to rearrange things to keep the old behaviour (don't clear the settings
until you know the config file parses) and the new (don't nest calls to
synchronize) by:
1. Splitting clear into two parts--clear, which works as before, and
unsafe_clear which it calls and which expects synchronization to be
handled externally.
2. Rearranging the code to recover the previous calling order
3. Trapping syntax errors and turning them into logged messages and a
no-op effect.
4. Fixing reparse to not wrap a call to this code with a synchronize.
5. Tests.
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet/application/puppetrun.rb')
0 files changed, 0 insertions, 0 deletions