Markus Roberts wrote:
> The fix for #4644 usurped an existing option flag to supress the installation
> of man pages on Microsoft Windows, when the desired behaviour was to only skip
> the installation on MSWin and not change the behaviour on other platforms.
> This patch implements the check explicitly to correctly express the desired
> behaviour.
>
> Signed-off-by: Markus Roberts <[email protected]>
> ---
>  install.rb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/install.rb b/install.rb
> index 449223d..f7541c8 100755
> --- a/install.rb
> +++ b/install.rb
> @@ -462,4 +462,4 @@ prepare_installation
>  do_bins(sbins, InstallOptions.sbin_dir)
>  do_bins(bins, InstallOptions.bin_dir)
>  do_libs(libs)
> -do_man(man) if InstallOptions.man
> +do_man(man) unless $operatingsystem == "windows"

This makes it impossible to disable the man installation via --no-man,
doesn't it?

I posted a patch here the other day that does similar, but honors a
user setting for --[no-]man AFAICT.  Of course, behavior prior to
#4644 didn't honor --[no-]man for installation either, so it's hard to
say which is more desirable. :)

http://groups.google.com/group/puppet-dev/browse_thread/thread/6e589c944ff8c50f

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
We hold that what one man cannot morally do, a million men cannot
morally do, and government, representing many millions of men, cannot
do.
    -- Auberon Herbert

Attachment: pgpvBZZPp1Eq9.pgp
Description: PGP signature

Reply via email to