Skip to content

Commit

Permalink
Lookup is_pe fact with getvar
Browse files Browse the repository at this point in the history
If the system is not running PE, the $::is_pe fact will be undefined,
causing errors when run under strict variables mode. This patch uses
the getvar() function to look up the fact so that it won't fail if not
defined.

Alternative to puppetlabs/puppetlabs-concat#270

This should fix the broken CI for the postgresql module.
  • Loading branch information
Colleen Murphy committed Feb 23, 2015
1 parent 9b3f4b3 commit 59d7a3a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
$command = strip(regsubst("${script_command} -o \"${fragdir}/${concat_name}\" -d \"${fragdir}\" ${warnflag} ${forceflag} ${orderflag} ${newlineflag}", '\s+', ' ', 'G'))

# make sure ruby is in the path for PE
if $::is_pe {
if getvar('::is_pe') {
if $::kernel == 'windows' {
$command_path = "${::env_windows_installdir}/bin:${::path}"
} else {
Expand Down

0 comments on commit 59d7a3a

Please sign in to comment.