chef 12.1.0-x86-mingw32 → 12.1.1-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: acde9658a244e57df558e0690e5495cfe01fed27
4
- data.tar.gz: a29d0677accc1df0b931e6c7be987d3ee10f1c29
3
+ metadata.gz: c4b57d6bd8e501cca7cd5c71106b2a90195da33b
4
+ data.tar.gz: 372e17a2b5e6305ed94770ad87b790b231a29bd8
5
5
  SHA512:
6
- metadata.gz: 1feed90c05323a1e361cc96a7b07fe48320fb1dfa4cb651d9ee55cbc7e2ae041dbb4c06559791e3237f53a0fee960525b1bca8bb92569841641944f95b62e30d
7
- data.tar.gz: 289350200a6a9fb25916a8bf7e4c11b19ed2a6539761e619d68205db72d9231ea06ae0b2e7273e1df918515f5d67d418d99ff358d85f5d4ef18543f1fdc0bc0e
6
+ metadata.gz: 80a260442cd7b9d477e07f66db552fa19e5575c41be75a743b73088ed5ac0b42bf272231ab5d4fd4daf21bfd516eacc1820d334c25a62763d65c8c68495b8a9a
7
+ data.tar.gz: 8174a02b736b86b5a8c0bf8f086c9e87b9a30144e71b9c14b140c6b388cf2cd2f8e048d9727955d712c83d09ce4ddcb021d1abff71613bae7fb6899764534a18
@@ -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
data/lib/chef/version.rb CHANGED
@@ -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: x86-mingw32
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