Skip to content

Commit

Permalink
Merge pull request redhat-openstack#274 from puppetlabs/revert-273-fi…
Browse files Browse the repository at this point in the history
…x_strict_vars

Revert "Lookup is_pe fact with getvar"
  • Loading branch information
Morgan Haskel committed Feb 24, 2015
2 parents a4133c4 + 410e180 commit 9e1a8f8
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 getvar('::is_pe') {
if $::is_pe {
if $::kernel == 'windows' {
$command_path = "${::env_windows_installdir}/bin:${::path}"
} else {
Expand Down

0 comments on commit 9e1a8f8

Please sign in to comment.