Merge pull request #524 from mhaskel/better_defined_check

Only use the strict variables workaround if using strict variables

diff --git a/manifests/params.pp b/manifests/params.pp
index 0b1afe74aa66b0bcde2d50aa63edbb64188270ce..d4f838946a342dfcbc7059d2138037b52203841c 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,7 +6,7 @@ class apt::params {
 
   # 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,