summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2010-07-21 23:10:46 +0200
committerMarkus Roberts <Markus@reality.com>2010-07-25 22:24:31 -0700
commit7ad7eb12fade4695abf08392e80ca57003353140 (patch)
tree5f2f186167da4dcba7a5166250e98732a5d2b13a /lib/puppet/util
parent28bb1950cf040eaf5196e39f43b3a9d0d61175a7 (diff)
downloadpuppet-7ad7eb12fade4695abf08392e80ca57003353140.tar.gz
puppet-7ad7eb12fade4695abf08392e80ca57003353140.tar.xz
puppet-7ad7eb12fade4695abf08392e80ca57003353140.zip
Fix #4286 - rename puppetdoc global module <site> to __site__
< and > might be invalid or borderline chars to use for a file name or an url. This patch changes those characters to __. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/util')
-rw-r--r--lib/puppet/util/rdoc/parser.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 573d1766f..63df38ab9 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -15,6 +15,8 @@ module RDoc
class Parser
extend ParserFactory
+ SITE = "__site__"
+
attr_accessor :ast, :input_file_name, :top_level
# parser registration into RDoc
@@ -74,7 +76,7 @@ class Parser
# split_module tries to find if +path+ belongs to the module path
# if it does, it returns the module name, otherwise if we are sure
- # it is part of the global manifest path, "<site>" is returned.
+ # it is part of the global manifest path, "__site__" is returned.
# And finally if this path couldn't be mapped anywhere, nil is returned.
def split_module(path)
# find a module
@@ -105,7 +107,7 @@ class Parser
end
# we are under a global manifests
Puppet.debug "rdoc: global manifests"
- "<site>"
+ SITE
end
# create documentation for the top level +container+
@@ -128,7 +130,7 @@ class Parser
Puppet.debug "rdoc: scanning for #{name}"
container.module_name = name
- container.global=true if name == "<site>"
+ container.global=true if name == SITE
@stats.num_modules += 1
container, name = get_class_or_module(container,name)