summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-13 21:23:22 -0500
committerLuke Kanies <luke@madstop.com>2008-05-13 21:23:22 -0500
commitb8de4e4af43c9850210e16ddbf4650feb194246e (patch)
treed2a651ee52b9e9302761a9561eecf93eb180bab1
parentc5492c2b7c539fe6f6a33b7b31a59d931808658e (diff)
downloadfacter-b8de4e4af43c9850210e16ddbf4650feb194246e.tar.gz
facter-b8de4e4af43c9850210e16ddbf4650feb194246e.tar.xz
facter-b8de4e4af43c9850210e16ddbf4650feb194246e.zip
Simplifying Confine a bit
-rw-r--r--lib/facter/confine.rb20
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/facter/confine.rb b/lib/facter/confine.rb
index 4d30630..529c968 100644
--- a/lib/facter/confine.rb
+++ b/lib/facter/confine.rb
@@ -25,29 +25,17 @@ class Facter::Confine
# Evaluate the fact, returning true or false.
def true?
- fact = nil
unless fact = Facter[@fact]
Facter.debug "No fact for %s" % @fact
return false
end
value = fact.value
- if value.nil?
- return false
- end
+ return false if value.nil?
- retval = @values.find { |v|
- if value.downcase == v.downcase
- break true
- end
+ @values.each { |v|
+ return true if value.downcase == v.downcase
}
-
- if retval
- retval = true
- else
- retval = false
- end
-
- return retval || false
+ return false
end
end