chef 12.1.0 → 12.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1c03a42f5cdc6d6db6b15583d95b6e865828e0fc
4
- data.tar.gz: eb9eeb4f03d56ed71fcea101d015eb86e41211ce
3
+ metadata.gz: 82c61d2c49f8f11a4e6c2d41a7bc5adee542f2dc
4
+ data.tar.gz: c8b40f319c99568a237db6fb7112d3945ea7691c
5
5
  SHA512:
6
- metadata.gz: b5b1f35e77c6413fdb63a72709994ebd0871c359ac8ecf38d0f01a284c84ed5e96c3aca1f59d01846aa49a1f3b2fbc9a1ece7462b9a2882c70ab27f534c867d7
7
- data.tar.gz: 7fc10d7fe903d5efdd098cf077004b38fde87de69d8c04c77fcc4d110ec5b649b61c12594de70c6e1d0f6bb0ebfdf42ebefcd7fe894698cb16c972168cf29bb1
6
+ metadata.gz: 59c300073ab324ae2d095120bfa6ec55dee5d927110bc6a2b1cc5a01ba0c152313d2056d849c398bbeda6f801a4357983f982c4c5e63f2dbd37ba67a21159d18
7
+ data.tar.gz: 85fd4cc2dbfd1a876b2c46429a0429936dd4936506068af4edd4300de1f19dd9f56e91effb0e31affa52ecf43347ef24a54a45da521286be02277009ece72acf
@@ -106,8 +106,7 @@ class Chef
106
106
  formatted_item = Hash.new
107
107
  if item.is_a?(Hash)
108
108
  # doing a little magic here to set the correct name
109
- formatted_item[item["data"]["__display_name"]] = item["data"]
110
- formatted_item[item["data"]["__display_name"]].delete("__display_name")
109
+ formatted_item[item["__display_name"]] = item.reject{|k| k == "__display_name"}
111
110
  else
112
111
  formatted_item = format_for_display(item)
113
112
  end
@@ -25,6 +25,7 @@ require 'chef/platform'
25
25
  class Chef
26
26
  class Provider
27
27
  class Package < Chef::Provider
28
+ include Chef::Mixin::Command
28
29
  include Chef::Mixin::ShellOut
29
30
 
30
31
  #
@@ -54,8 +55,11 @@ class Chef
54
55
  a.whyrun("Assuming a repository that offers #{forced_packages_missing_candidates.join(", ")} would have been configured")
55
56
  end
56
57
 
58
+ # XXX: Does it make sense to pass in a source with :upgrade? Probably
59
+ # not, but as with the above comment, we don't yet enforce such a thing,
60
+ # so we'll just leave things as-is for now.
57
61
  requirements.assert(:upgrade, :install) do |a|
58
- a.assertion { candidates_exist_for_all_uninstalled? }
62
+ a.assertion { candidates_exist_for_all_uninstalled? || new_resource.source }
59
63
  a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}")
60
64
  a.whyrun("Assuming a repository that offers #{packages_missing_candidates.join(", ")} would have been configured")
61
65
  end
@@ -17,7 +17,7 @@
17
17
 
18
18
  class Chef
19
19
  CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
20
- VERSION = '12.1.0'
20
+ VERSION = '12.1.1'
21
21
  end
22
22
 
23
23
  #
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef
3
3
  version: !ruby/object:Gem::Version
4
- version: 12.1.0
4
+ version: 12.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-03 00:00:00.000000000 Z
11
+ date: 2015-03-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-config