diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-12 20:11:35 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-12 20:11:35 +0000 |
| commit | 4abbdc13f4a1762eb5d848763dde1780f6408de8 (patch) | |
| tree | 32c95243992a42465a02ae3194dd98cfd4baea89 /lib/puppet.rb | |
| parent | 8fee5383eb214b7e4aa38b0438f23d2a326fb103 (diff) | |
| download | puppet-4abbdc13f4a1762eb5d848763dde1780f6408de8.tar.gz puppet-4abbdc13f4a1762eb5d848763dde1780f6408de8.tar.xz puppet-4abbdc13f4a1762eb5d848763dde1780f6408de8.zip | |
Working some on the export/collect problem. It actually works now, but there are not yet sufficient tests for it, so I will leave the bug open until we have got the new work in place. I also added a "rails" feature, so I do not have to keep testing whether ActiveRecord is defined.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1911 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 54a9f6c77..1da2ca6dd 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -72,7 +72,6 @@ module Puppet # The feature collection @features = Puppet::Feature.new('puppet/feature') - @features.load # Store a new default value. def self.setdefaults(section, hash) @@ -386,6 +385,9 @@ module Puppet def self.type(name) Puppet::Type.type(name) end + + # Only load all of the features once the Puppet module methods are defined. + @features.load end require 'puppet/server' |