Issue #4945 has been updated by Markus Roberts.
Status changed from Ready for Testing to Code Insufficient
The analysis leading to this patch is incorrect; the lines in question weren't
introduced in the fix for #4644 (just the manner of detecting MS Windows was
changed) and the proposed fix would produce different results than the code
before the fix for #4644.
The change introduced in #4644:
<pre>
@@ -166,7 +169,7 @@ def prepare_installation
if $haveman
InstallOptions.man = true
- if RUBY_PLATFORM == "i386-mswin32"
+ if $operatingsystem == "windows"
InstallOptions.man = false
end
else
</pre>
And the proposed fix on git://jet.mox.net/~tmz/puppet.git tickets/2.6.x/4644
<pre>
@@ -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
</pre>
The present code is just a very wordy way of writing:
<pre>
InstallOptions.man = $haveman && ($operatingsystem != "windows")
</pre>
while the code that it replaced was a wordy way of writing the semantically
equivalent:
<pre>
InstallOptions.man = $haveman && (RUBY_PLATFORM != "i386-mswin32")
</pre>
While the proposed fix:
<pre>
InstallOptions.man = $operatingsystem != "windows"
</pre>
just eliminates the check on $haveman which has been present, unchanged, since
the spring of 2008.
----------------------------------------
Bug #4945: The fix for #4644 breaks man page instalation.
http://projects.puppetlabs.com/issues/4945
Author: Markus Roberts
Status: Code Insufficient
Priority: Normal
Assignee: Markus Roberts
Category:
Target version: 2.6.2
Affected version: 2.6.2rc1
Keywords:
Branch: git://jet.mox.net/~tmz/puppet.git tickets/2.6.x/4644
As reported by Todd Zullinger, the patch had an unintended side-effect on
non-windows systems:
Man pages are now no longer installed unless rdoc/ronn are present.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://projects.puppetlabs.com/my/account
--
You received this message because you are subscribed to the Google Groups
"Puppet Bugs" 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-bugs?hl=en.
