diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-01 00:08:15 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-01 00:08:15 -0500 |
| commit | 5e78151d1736e2c4cb741c2cbb7c6b5a59ed3e13 (patch) | |
| tree | 428a352bd3e8d4153e798ffdba390d02b5d63d68 /lib/puppet/util | |
| parent | 88dc49cb7b0efe757c92ce28c807b91335acb07a (diff) | |
Fixing tests that were failing as a result of the merge,
including removing some now-obsolete code and tests from
the Settings class.
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/settings.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 089389a09..24a71516a 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -65,7 +65,6 @@ class Puppet::Util::Settings config = trans.to_catalog config.store_state = false config.apply - config.clear rescue => detail if Puppet[:trace] puts detail.backtrace @@ -589,8 +588,6 @@ Generated on #{Time.now}. raise "Could not configure for running; got %s failure(s)" % failures end end - ensure - catalog.clear end sections.each { |s| @used << s } @@ -1075,7 +1072,6 @@ Generated on #{Time.now}. return nil unless path.is_a?(String) return nil if path =~ /^\/dev/ - return nil if Puppet::Type.type(:file)[path] # skip files that are in our global resource list. objects = [] |