diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-03-07 06:27:13 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-03-07 06:27:13 +1100 |
| commit | 86ee6b3d55fb5f3c99bf9c0b5ee1c6013e9a1aa1 (patch) | |
| tree | 519ddb332c758fb91a1b14c6f5895ad07efecdfe | |
| parent | 74f4c40a06ca56a56e166bfc0ac247d002bdbea2 (diff) | |
| parent | 3e6217d63c73c720a7d697d810f556adf13f134b (diff) | |
| download | facter-86ee6b3d55fb5f3c99bf9c0b5ee1c6013e9a1aa1.tar.gz facter-86ee6b3d55fb5f3c99bf9c0b5ee1c6013e9a1aa1.tar.xz facter-86ee6b3d55fb5f3c99bf9c0b5ee1c6013e9a1aa1.zip | |
Merge branch 'tickets/master/6521'
| -rw-r--r-- | lib/facter/lsb.rb | 8 | ||||
| -rw-r--r-- | lib/facter/util/vlans.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/facter/lsb.rb b/lib/facter/lsb.rb index 4b98466..bf4b9db 100644 --- a/lib/facter/lsb.rb +++ b/lib/facter/lsb.rb @@ -22,13 +22,13 @@ Facter.add(fact) do confine :kernel => [ :linux, :"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 diff --git a/lib/facter/util/vlans.rb b/lib/facter/util/vlans.rb index 6d226ff..2b2a72f 100644 --- a/lib/facter/util/vlans.rb +++ b/lib/facter/util/vlans.rb @@ -12,7 +12,7 @@ module Facter::Util::Vlans def self.get_vlans vlans = Array.new if self.get_vlan_config - self.get_vlan_config.each do |line| + self.get_vlan_config.each_line do |line| if line =~ /^([0-9A-Za-z]+)\.([0-9]+) / vlans.insert(-1, $~[2]) if $~[2] end @@ -21,4 +21,4 @@ module Facter::Util::Vlans vlans.join(',') end -end +end |