diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-08 09:23:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-08 09:23:34 -0600 |
| commit | 3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e (patch) | |
| tree | 2d47761110c458f175f6483f0424a959cbcb3f34 /lib/puppet/util | |
| parent | fe9b453650755e66e29eca259075e2e7245a5219 (diff) | |
| download | puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.tar.gz puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.tar.xz puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.zip | |
Lots o' bug-fixes toward getting rid of global resources.
We still have about 60 failing tests, but some of them are
the failing directory service tests (probably 20 or so),
and most are simple fixes to the tests themselves.
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/filetype.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb index 1c7734cc4..cddfc4689 100755 --- a/lib/puppet/util/filetype.rb +++ b/lib/puppet/util/filetype.rb @@ -74,8 +74,10 @@ class Puppet::Util::FileType # Pick or create a filebucket to use. def bucket - filebucket = Puppet::Type.type(:filebucket) - (filebucket["puppet"] || filebucket.mkdefaultbucket).bucket + unless defined?(@bucket) + @bucket = Puppet::Type.type(:filebucket).mkdefaultbucket.bucket + end + @bucket end def initialize(path) |