summaryrefslogtreecommitdiff
path: root/lib/chef/provider/package.rb
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2014-12-19 20:02:33 -0800
committerPhil Dibowitz <phil@ipom.com>2015-02-03 19:32:36 -0800
commit877278dcedddcbb447b89075e28b4d3b6692ee41 (patch)
treee4d87bd695ae0dc58b6046764d97a16947730dc2 /lib/chef/provider/package.rb
parentab4b814d97faf69ab3ddbaa80ce352ed8453ab46 (diff)
downloadchef-877278dcedddcbb447b89075e28b4d3b6692ee41.tar.gz
Several more cleanups
Diffstat (limited to 'lib/chef/provider/package.rb')
-rw-r--r--lib/chef/provider/package.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 1283538a0b..5c852017cb 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -48,6 +48,14 @@ class Chef
[ candidate_version ].flatten
end
+ def current_version_array
+ [ @current_resource.version ].flatten
+ end
+
+ def new_version_array
+ [ @new_resource.version ].flatten
+ end
+
def define_resource_requirements
requirements.assert(:install) do |a|
a.assertion { ((@new_resource.version != nil) && !(target_version_already_installed?)) \
@@ -120,10 +128,10 @@ class Chef
end
def removing_package?
- if ![ @current_resource.version ].flatten.any?
+ if !current_version_array.any?
# ! any? means it's all nil's, which means nothing is installed
false
- elsif ![ @new_resource.version ].flatten.any?
+ elsif !new_version_array.any?
true # remove any version of all packages
elsif @new_resource.version == @current_resource.version
true # remove the version we have