summaryrefslogtreecommitdiff
path: root/chef/lib
diff options
context:
space:
mode:
authorNuo Yan <nuo@opscode.com>2011-04-08 14:00:24 -0700
committerNuo Yan <nuo@opscode.com>2011-04-08 14:00:24 -0700
commit833676f066f55cd6c46b228f8dcf70a922626a59 (patch)
tree3bb85a7828496aa52b29fae046c803b94070872c /chef/lib
parentdf4ce624ea76207e4dc2703d2fe9466a13fce1b0 (diff)
downloadchef-833676f066f55cd6c46b228f8dcf70a922626a59.tar.gz
Fix CookbookVersion.available_versions method to return expected value
Diffstat (limited to 'chef/lib')
-rw-r--r--chef/lib/chef/cookbook_version.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/chef/lib/chef/cookbook_version.rb b/chef/lib/chef/cookbook_version.rb
index 45ac21c6ef..bce45578fb 100644
--- a/chef/lib/chef/cookbook_version.rb
+++ b/chef/lib/chef/cookbook_version.rb
@@ -861,7 +861,9 @@ class Chef
# [String]:: Array of cookbook versions, which are strings like 'x.y.z'
# nil:: if the cookbook doesn't exist. an error will also be logged.
def self.available_versions(cookbook_name)
- chef_server_rest.get_rest("cookbooks/#{cookbook_name}").values.flatten
+ chef_server_rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
+ cb["version"]
+ end
rescue Net::HTTPServerException => e
if e.to_s =~ /^404/
Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")