diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-21 17:52:06 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-21 17:52:06 -0600 |
| commit | c59ff622a33b82f413207a146edd4ff6e011e729 (patch) | |
| tree | 7d7efd74b8aab5c8e9c0bbf7a3f90304edae9caf /lib/puppet/util | |
| parent | 4d28b10cd1ac8b549d488f18d272ad589c75445d (diff) | |
| download | puppet-c59ff622a33b82f413207a146edd4ff6e011e729.tar.gz puppet-c59ff622a33b82f413207a146edd4ff6e011e729.tar.xz puppet-c59ff622a33b82f413207a146edd4ff6e011e729.zip | |
Further fixes toward #965. Turned out that the previous fix
caused other problems.
This whole thing will hopefully get *drastically* easier once we
get rid of global resources.
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/filetype.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb index 81d93a924..1c7734cc4 100755 --- a/lib/puppet/util/filetype.rb +++ b/lib/puppet/util/filetype.rb @@ -74,7 +74,8 @@ class Puppet::Util::FileType # Pick or create a filebucket to use. def bucket - Puppet::Type.type(:filebucket).mkdefaultbucket.bucket + filebucket = Puppet::Type.type(:filebucket) + (filebucket["puppet"] || filebucket.mkdefaultbucket).bucket end def initialize(path) |