X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Flsb-for-bsd.rb;h=c95d7f2eb67a3c7e1eb9b318fff637968ae42ad3;hb=b699362de1187bf21e28967cc45b6ab2c3bc5c66;hp=09fd3702d5daa84c5d7be880cdfe629325a51397;hpb=6b3c471b442882a3cf8d3f4154d2b1540f82eb85;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/lib/facter/lsb-for-bsd.rb b/modules/debian-org/lib/facter/lsb-for-bsd.rb index 09fd3702d..c95d7f2eb 100644 --- a/modules/debian-org/lib/facter/lsb-for-bsd.rb +++ b/modules/debian-org/lib/facter/lsb-for-bsd.rb @@ -7,13 +7,13 @@ Facter.add(fact) do confine :kernel => 'GNU/kFreeBSD' setcode do - unless defined?(@@lsbdata) and defined?(@@lsbtime) and (Time.now.to_i - @@lsbtime.to_i < 5) + unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5) type = nil - @@lsbtime = Time.now - @@lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null') + lsbtime = Time.now + lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null') end - if pattern.match(@@lsbdata) + if pattern.match(lsbdata) $1 else nil