diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-11-26 19:58:39 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-11-27 07:54:37 +1100 |
| commit | 3abcc896c84e1cd1c68fcb661c69090872294868 (patch) | |
| tree | 983ce73739391c4d87ac05c06cc58e51a4938bf9 /lib/puppet | |
| parent | f5dd6c888a5e5011d2dac074373984604506ab12 (diff) | |
| download | puppet-3abcc896c84e1cd1c68fcb661c69090872294868.tar.gz puppet-3abcc896c84e1cd1c68fcb661c69090872294868.tar.xz puppet-3abcc896c84e1cd1c68fcb661c69090872294868.zip | |
Fix #2783, take2 - puppetdoc should use environment to get modulepath/manifestdir
I was told that setting manifestdir in environment is not supported.
Only the manifest setting seems to be supported in environments.
This patch changes how puppetdoc handles manifestdir, instead
of getting it through the manifestdir variable, we now get the
manifest settings and infer the directory from this, exactly as
the parser is doing.
This allows puppetdoc to handle what user are doing with environments.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/application/puppetdoc.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/puppetdoc.rb index 0a4e0c3c3..e0033277f 100644 --- a/lib/puppet/application/puppetdoc.rb +++ b/lib/puppet/application/puppetdoc.rb @@ -68,7 +68,7 @@ Puppet::Application.new(:puppetdoc) do unless @manifest env = Puppet::Node::Environment.new files += env.modulepath - files += env.manifestdir + files << File.dirname(env[:manifest]) end files += ARGV Puppet.info "scanning: %s" % files.inspect |