diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-07 17:51:09 -0800 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-08 13:18:43 -0800 |
| commit | 2a915725adf0ccefcc28653cbba2219925194594 (patch) | |
| tree | 10df2000449d65e6b5954d2d8a1f5467fb10ad48 /lib/puppet/util/rdoc.rb | |
| parent | 28ce355be0a16caa8e1cc0b6f531d2be070ca6f2 (diff) | |
| download | puppet-2a915725adf0ccefcc28653cbba2219925194594.tar.gz puppet-2a915725adf0ccefcc28653cbba2219925194594.tar.xz puppet-2a915725adf0ccefcc28653cbba2219925194594.zip | |
(#4798) Make rdoc work if moduledir & manifestdir overlap
Merging 2.6.next into next caused a regression; this commit fixes that
regression.
Paired-with:Max Martin <max@puppetlabs.com>
Diffstat (limited to 'lib/puppet/util/rdoc.rb')
| -rw-r--r-- | lib/puppet/util/rdoc.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index 16d1fa15b..c00bc6f85 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -31,6 +31,7 @@ module Puppet::Util::RDoc options << "--force-update" if Options::OptionList.options.any? { |o| o[0] == "--force-update" } options += [ "--charset", charset] if charset options += files + #TODO dedup file paths (not strict duplication sense, parents, children, etc # launch the documentation process r.document(options) |