Merge pull request #543 from puppetlabs/revert-542-fix_apt_params

[puppet-modules/puppetlabs-apt.git] / manifests / params.pp

diff --git a/manifests/params.pp b/manifests/params.pp
index 32e4dbae6f6a936f109fbd73d373fd26c8733272..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,
@@ -150,7 +150,7 @@ class apt::params {
       }
     }
     undef: {
-      fail('Unable to determine lsbdistid, is lsb-release installed?')
+      fail('Unable to determine lsbdistid, please install lsb-release first')
     }
     default: {
       $ppa_options = undef