diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-11-11 20:25:28 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-11-15 10:06:03 +1100 |
| commit | 6c2daa36ded879763cfc1a6fac8f4e6d75a3cadb (patch) | |
| tree | 8c6d3e64429e70d7ebf7544333cb291a388f7165 /lib/puppet/application | |
| parent | 56486664f25f495182dd3e3708e760d4220b1199 (diff) | |
| download | puppet-6c2daa36ded879763cfc1a6fac8f4e6d75a3cadb.tar.gz puppet-6c2daa36ded879763cfc1a6fac8f4e6d75a3cadb.tar.xz puppet-6c2daa36ded879763cfc1a6fac8f4e6d75a3cadb.zip | |
Fix #2783 - Puppetdoc rdoc should use environment to get modulepath/manifestdir
Puppetdoc wasn't using the current environment to find the correct
modulepath and manifestdir.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/puppetdoc.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/puppetdoc.rb index a5496ccee..5656112d0 100644 --- a/lib/puppet/application/puppetdoc.rb +++ b/lib/puppet/application/puppetdoc.rb @@ -66,8 +66,9 @@ Puppet::Application.new(:puppetdoc) do exit_code = 0 files = [] unless @manifest - files += Puppet[:modulepath].split(':').collect { |p| File.expand_path(p) } - files += Puppet[:manifestdir].split(':').collect { |p| File.expand_path(p) } + env = Puppet::Node::Environment.new + files += env.modulepath + files += env.manifestdir end files += ARGV Puppet.info "scanning: %s" % files.inspect |