diff options
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rw-r--r-- | Gemfile.lock | 22 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/homebrew_cask.rb | 6 | ||||
-rw-r--r-- | lib/chef/resource/locale.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
9 files changed, 25 insertions, 24 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bd89dadf0c..b03c2ea722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,19 @@ This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 15.14.8 --> -## [v15.14.8](https://github.com/chef/chef/tree/v15.14.8) (2021-01-06) +<!-- latest_release 15.14.10 --> +## [v15.14.10](https://github.com/chef/chef/tree/v15.14.10) (2021-01-06) #### Merged Pull Requests -- Bump omnibus from `d13ae16` to `44f1303` in /omnibus [#10842](https://github.com/chef/chef/pull/10842) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) -- Bump test-kitchen from 2.8.0 to 2.9.0 in /omnibus [#10843](https://github.com/chef/chef/pull/10843) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) +- locale: Update the locale-gen timeout to 1800s [#10844](https://github.com/chef/chef/pull/10844) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.14.0 --> ### Changes not yet released to stable #### Merged Pull Requests +- locale: Update the locale-gen timeout to 1800s [#10844](https://github.com/chef/chef/pull/10844) ([tas50](https://github.com/tas50)) <!-- 15.14.10 --> +- Fix homebrew_cask for the new syntax [#10845](https://github.com/chef/chef/pull/10845) ([tas50](https://github.com/tas50)) <!-- 15.14.9 --> - Bump omnibus from `d13ae16` to `44f1303` in /omnibus [#10842](https://github.com/chef/chef/pull/10842) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 15.14.8 --> - Bump test-kitchen from 2.8.0 to 2.9.0 in /omnibus [#10843](https://github.com/chef/chef/pull/10843) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 15.14.7 --> - Bump omnibus-software from `457df26` to `869ef4e` in /omnibus [#10841](https://github.com/chef/chef/pull/10841) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 15.14.7 --> diff --git a/Gemfile.lock b/Gemfile.lock index f251bd1a7c..84cbcc8bae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,12 +19,12 @@ GIT PATH remote: . specs: - chef (15.14.8) + chef (15.14.10) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.14.8) - chef-utils (= 15.14.8) + chef-config (= 15.14.10) + chef-utils (= 15.14.10) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -51,12 +51,12 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.14.8-universal-mingw32) + chef (15.14.10-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.14.8) - chef-utils (= 15.14.8) + chef-config (= 15.14.10) + chef-utils (= 15.14.10) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -99,15 +99,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.14.8) - chef (= 15.14.8) + chef-bin (15.14.10) + chef (= 15.14.10) PATH remote: chef-config specs: - chef-config (15.14.8) + chef-config (15.14.10) addressable - chef-utils (= 15.14.8) + chef-utils (= 15.14.10) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -116,7 +116,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (15.14.8) + chef-utils (15.14.10) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.14.8
\ No newline at end of file +15.14.10
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index f410af52ac..0fbd0e7735 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "15.14.8".freeze + VERSION = "15.14.10".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 550b483f20..3b22a90a31 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "15.14.8".freeze + VERSION = "15.14.10".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 0653f34859..ffc14df909 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -15,5 +15,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "15.14.8".freeze + VERSION = "15.14.10".freeze end diff --git a/lib/chef/resource/homebrew_cask.rb b/lib/chef/resource/homebrew_cask.rb index 3842d96aaf..d356030719 100644 --- a/lib/chef/resource/homebrew_cask.rb +++ b/lib/chef/resource/homebrew_cask.rb @@ -59,7 +59,7 @@ class Chef unless casked? converge_by("install cask #{new_resource.cask_name} #{new_resource.options}") do - shell_out!("#{new_resource.homebrew_path} cask install #{new_resource.cask_name} #{new_resource.options}", + shell_out!("#{new_resource.homebrew_path} install --cask #{new_resource.cask_name} #{new_resource.options}", user: new_resource.owner, env: { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner }, cwd: ::Dir.home(new_resource.owner)) @@ -74,7 +74,7 @@ class Chef if casked? converge_by("uninstall cask #{new_resource.cask_name}") do - shell_out!("#{new_resource.homebrew_path} cask uninstall #{new_resource.cask_name}", + shell_out!("#{new_resource.homebrew_path} uninstall --cask #{new_resource.cask_name}", user: new_resource.owner, env: { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner }, cwd: ::Dir.home(new_resource.owner)) @@ -92,7 +92,7 @@ class Chef # @return [Boolean] def casked? unscoped_name = new_resource.cask_name.split("/").last - shell_out!("#{new_resource.homebrew_path} cask list 2>/dev/null", + shell_out!("#{new_resource.homebrew_path} list --cask 2>/dev/null", user: new_resource.owner, env: { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner }, cwd: ::Dir.home(new_resource.owner)).stdout.split.include?(unscoped_name) diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb index 4914b88168..243fb813ad 100644 --- a/lib/chef/resource/locale.rb +++ b/lib/chef/resource/locale.rb @@ -97,7 +97,7 @@ class Chef # @raise [Mixlib::ShellOut::ShellCommandFailed] not a supported language or locale # def generate_locales - shell_out!("locale-gen #{unavailable_locales.join(" ")}") + shell_out!("locale-gen #{unavailable_locales.join(" ")}", timeout: 1800) end # Updates system locale by appropriately writing them in /etc/locale.conf diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 21511157fc..f78687b805 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("15.14.8") + VERSION = Chef::VersionString.new("15.14.10") end # |