summaryrefslogtreecommitdiffstats
path: root/lib/puppet/defaults.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-24 23:17:57 -0600
committerLuke Kanies <luke@madstop.com>2007-11-24 23:17:57 -0600
commit4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200 (patch)
tree431872a6909aab930d4585d1b4b4d730f4bfb703 /lib/puppet/defaults.rb
parent7eb09abebb91a567b081a651fce179acfadfb7c0 (diff)
parentb575d1585322709604f558742dfd6f5ce412b342 (diff)
downloadpuppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.gz
puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.xz
puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.zip
Merge branch 'plugins_mount', fixing #891.
Conflicts: CHANGELOG
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 8edbe31fe..5b9b4ea9a 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -110,6 +110,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)