[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, experimental_upstream, updated. 1.5.9-54-g5a4eeed
Matt Robinson
matt at puppetlabs.com
Wed Jun 22 08:51:43 UTC 2011
The following commit has been merged in the experimental_upstream branch:
commit 72996ff6d01c6891bad241c45a5555e1a639ddd5
Author: Matt Robinson <matt at puppetlabs.com>
Date: Tue Mar 22 21:37:10 2011 -0700
maint: cleanup whitespace
diff --git a/lib/facter/memory.rb b/lib/facter/memory.rb
index 9dd2e29..0aa5e88 100644
--- a/lib/facter/memory.rb
+++ b/lib/facter/memory.rb
@@ -23,30 +23,30 @@ end
Facter.add("SwapSize") do
confine :kernel => :Darwin
setcode do
- swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
- swaptotal = 0
- if swap =~ /total = (\S+)/ then swaptotal = $1; end
- swaptotal
+ swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+ swaptotal = 0
+ if swap =~ /total = (\S+)/ then swaptotal = $1; end
+ swaptotal
end
end
Facter.add("SwapFree") do
confine :kernel => :Darwin
setcode do
- swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
- swapfree = 0
- if swap =~ /free = (\S+)/ then swapfree = $1; end
- swapfree
+ swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+ swapfree = 0
+ if swap =~ /free = (\S+)/ then swapfree = $1; end
+ swapfree
end
end
Facter.add("SwapEncrypted") do
confine :kernel => :Darwin
setcode do
- swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
- encrypted = false
- if swap =~ /\(encrypted\)/ then encrypted = true; end
- encrypted
+ swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+ encrypted = false
+ if swap =~ /\(encrypted\)/ then encrypted = true; end
+ encrypted
end
end
@@ -57,9 +57,9 @@ if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
swaptotal += $1.to_i
swapfree += $2.to_i
- end
- end
-
+ end
+ end
+
Facter.add("SwapSize") do
confine :kernel => :aix
setcode do
@@ -154,9 +154,9 @@ if Facter.value(:kernel) == "SunOS"
if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
swaptotal += $1.to_i / 2
swapfree += $2.to_i / 2
- end
- end
-
+ end
+ end
+
Facter.add("SwapSize") do
confine :kernel => :sunos
setcode do
diff --git a/lib/facter/util/memory.rb b/lib/facter/util/memory.rb
index 029b117..b7ad198 100644
--- a/lib/facter/util/memory.rb
+++ b/lib/facter/util/memory.rb
@@ -94,4 +94,3 @@ module Facter::Memory
end
end
end
-
--
Packaging of Facter for debian
More information about the Pkg-puppet-devel
mailing list