[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.2rc1-118-g539d0bf

Markus Roberts Markus at reality.com
Sun Oct 17 19:06:58 UTC 2010


The following commit has been merged in the upstream branch:
commit 1d719bee75e10657c8b31a4672fe24c12a235d4d
Author: Markus Roberts <Markus at reality.com>
Date:   Wed Oct 6 15:25:20 2010 -0700

    Fix for #4945 -- explicitly check os to supress man page installation
    
    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.

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"

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list