diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-01-21 10:47:32 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-01-21 10:47:32 -0800 |
| commit | f999fa3ce829954fa72f35500f8cf8dcf040a471 (patch) | |
| tree | 95c189a6a49e6ba4834a6b3cebd6243aae9e23da | |
| parent | 9bb2444bd13cb35c5b147c76de4e90c722158f49 (diff) | |
| download | chef-f999fa3ce829954fa72f35500f8cf8dcf040a471.tar.gz | |
Remove ohai from omnibus_overrides
The omnibus-software defn no longer exists.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | omnibus_overrides.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 008614bdeb..043e88bf0a 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -21,11 +21,3 @@ override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" override "zlib", version: "1.2.11" - -# We build both chef and ohai omnibus-software definitions which creates the -# chef-client and ohai binstubs. Out of the box the ohai definition uses whatever -# is in master, which won't match what's in the Gemfile.lock and used by the chef -# definition. This pin will ensure that ohai and chef-client commands use the -# same (released) version of ohai. -gemfile_lock = File.join(File.expand_path(__dir__), "Gemfile.lock") -override "ohai", version: "#{::File.readlines(gemfile_lock).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; "v" + $1}" # rubocop: disable Layout/SpaceInsideStringInterpolation |