diff --git a/manifests/params.pp b/manifests/params.pp index b75a0e7..ea1087e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,9 +4,9 @@ class apt::params { fail('This module only works on Debian or derivatives like Ubuntu') } - # 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 ! $::settings::strict_variables { + # 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 $::puppetversion and versioncmp($::puppetversion, '3.5.0') < 0 { $xfacts = { 'lsbdistcodename' => $::lsbdistcodename, 'lsbdistrelease' => $::lsbdistrelease, diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb index 2faee9e..7937c78 100644 --- a/spec/defines/key_compat_spec.rb +++ b/spec/defines/key_compat_spec.rb @@ -4,6 +4,7 @@ describe 'apt::key', :type => :define do let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', + :puppetversion => Puppet.version, } } GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb index 0b98176..11d6d3a 100644 --- a/spec/defines/source_compat_spec.rb +++ b/spec/defines/source_compat_spec.rb @@ -13,6 +13,7 @@ describe 'apt::source', :type => :define do :lsbdistid => 'Debian', :lsbdistcodename => 'wheezy', :osfamily => 'Debian', + :puppetversion => Puppet.version, } end @@ -34,6 +35,7 @@ describe 'apt::source', :type => :define do :lsbdistid => 'Debian', :lsbdistcodename => 'wheezy', :osfamily => 'Debian' + :puppetversion => Puppet.version, } end let :params do @@ -88,7 +90,8 @@ describe 'apt::source', :type => :define do { :lsbdistid => 'Debian', :lsbdistcodename => 'wheezy', - :osfamily => 'Debian' + :osfamily => 'Debian', + :puppetversion => Puppet.version, } end let :params do @@ -107,7 +110,8 @@ describe 'apt::source', :type => :define do { :lsbdistid => 'Debian', :lsbdistcodename => 'wheezy', - :osfamily => 'Debian' + :osfamily => 'Debian', + :puppetversion => Puppet.version, } end let :params do @@ -126,7 +130,8 @@ describe 'apt::source', :type => :define do { :lsbdistid => 'Debian', :lsbdistcodename => 'wheezy', - :osfamily => 'Debian' + :osfamily => 'Debian', + :puppetversion => Puppet.version, } end let :params do @@ -146,7 +151,8 @@ describe 'apt::source', :type => :define do let :facts do { :lsbdistid => 'Debian', - :osfamily => 'Debian' + :osfamily => 'Debian', + :puppetversion => Puppet.version, } end