diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-19 12:57:29 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-19 17:51:21 -0600 |
| commit | b800bde30bd5a08f5e222725588062e2bca37a79 (patch) | |
| tree | 5d56ddb761a7892e883b7be62b1d3eeb5ca3fced /lib/puppet/application.rb | |
| parent | d7864bedafcca07806f6da3e3f472dc80d3206b7 (diff) | |
| download | puppet-b800bde30bd5a08f5e222725588062e2bca37a79.tar.gz puppet-b800bde30bd5a08f5e222725588062e2bca37a79.tar.xz puppet-b800bde30bd5a08f5e222725588062e2bca37a79.zip | |
Refactoring how the Settings file is parsed
The goal of this refactor was to use a cached attribute
for the LoadedFile instance we use to monitor whether
the file needs reparsing. We were getting tests that
affected later tests because they were holding on to
LoadedFile stubs, somehow.
The other main change here is that the Settings#parse
method now knows how to look up its own file path.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/application.rb')
| -rw-r--r-- | lib/puppet/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 3f3b2e10e..88ad9d493 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -212,7 +212,7 @@ class Puppet::Application def run run_preinit parse_options - Puppet.parse_config if should_parse_config? + Puppet.settings.parse if should_parse_config? run_setup run_command end @@ -299,4 +299,4 @@ class Puppet::Application end end -end
\ No newline at end of file +end |