Merge pull request #524 from mhaskel/better_defined_check

Only use the strict variables workaround if using strict variables
puppetlabs · May 11, 2015 · 535a5b6 · 535a5b6
2 parents 5d62ceb + 3838c66
commit 535a5b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -6,7 +6,7 @@
 
   # prior to puppet 3.5.0, defined couldn't test if a variable was defined
   # strict variables wasn't added until 3.5.0, so this should be fine.
-  if versioncmp($::puppetversion, '3.5.0') < 0 {
+  if ! $::settings::strict_variables {
     $xfacts = {
       'lsbdistcodename'     => $::lsbdistcodename,
       'lsbdistrelease'      => $::lsbdistrelease,