In 021359b (Fix for #4644: install.rb works properly on Windows), an
improper dependency on rdoc/ronn was exposed. InstallOptions.man
defaulted to false unless rdoc was present. Since pre-built man pages
are shipped in git and the tarball, don't require rdoc or ronn in order
to install the man pages.
---
I don't have any windows systems to test this on. But I believe the
intent and result will be correct. It works for me on Fedora/EPEL.
Available from git://jet.mox.net/~tmz/puppet.git tickets/2.6.x/4644
install.rb | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/install.rb b/install.rb
index 449223d..98de315 100755
--- a/install.rb
+++ b/install.rb
@@ -166,15 +166,7 @@ def prepare_installation
InstallOptions.ri = false
end
-
- if $haveman
- InstallOptions.man = true
- if $operatingsystem == "windows"
- InstallOptions.man = false
- end
- else
- InstallOptions.man = false
- end
+ InstallOptions.man = $operatingsystem != "windows"
InstallOptions.tests = true
--
1.7.3
--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To have a successful relationship, I must learn to make it look like
I'm giving as much as I'm getting.
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
