Skip to content

Commit 1f88d56

Browse files
committed
Revert "(PUP-391) Fix Rdoc 4+ specs on Windows Ruby 2 x64"
This reverts commit 6767686. As we are removing the Dir (win32/dir) monkeypatches, this workaround is no longer needed.
1 parent 36f0f77 commit 1f88d56

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

lib/puppet/util/rdoc.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ def rdoc(outputdir, files, charset = nil)
2626

2727
options << "--force-update"
2828
options += [ "--charset", charset] if charset
29-
# Rdoc root default is Dir.pwd, but the win32-dir gem monkey patches Dir.pwd
30-
# replacing Ruby's normal / with \. When RDoc generates relative paths it
31-
# uses relative_path_from that will generate errors when the slashes don't
32-
# properly match. This is a workaround for that issue.
33-
if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
34-
options += [ "--root", Dir.pwd.tr('\\', '/')]
35-
end
3629
options += files
3730

3831
# launch the documentation process

0 commit comments

Comments
 (0)