summaryrefslogtreecommitdiffstats
path: root/lib/puppet/defaults.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-24 23:16:47 -0600
committerLuke Kanies <luke@madstop.com>2007-11-24 23:16:47 -0600
commitb575d1585322709604f558742dfd6f5ce412b342 (patch)
tree34e8049bf27383cb19ea23edf4d7d2a870eb7b48 /lib/puppet/defaults.rb
parent3fb8e2e3097c0a9ef0c534a9c96fe02b43b5e38c (diff)
downloadpuppet-b575d1585322709604f558742dfd6f5ce412b342.tar.gz
puppet-b575d1585322709604f558742dfd6f5ce412b342.tar.xz
puppet-b575d1585322709604f558742dfd6f5ce412b342.zip
Integrating Matt Palmer's patch to provide a 'plugins'
mount, fixing #891. The patch was ported to the current code by David Schmitt, I applied the rest of Matt's patches, and I then fixed all of the code so that the tests passed. The primary change I had to make to the patch was reenabling host expansion in paths -- his patch had disabled it.
Diffstat (limited to 'lib/puppet/defaults.rb')
-rw-r--r--lib/puppet/defaults.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 9a95c3cab..34f166108 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -111,6 +111,7 @@ module Puppet
guaranteed to work for those cases. In fact, the autoload
mechanism is responsible for making sure this directory
is in Ruby's search path",
+ :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
:hook => proc do |value|
if defined? @oldlibdir and $:.include?(@oldlibdir)
$:.delete(@oldlibdir)