IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Update facter usage

Browse Source 
`Facter.reset` (65d167eac9/lib/facter.rb (L126-L137)) clears `Facter::Options[:external_dir]` which seems to be the 4.x equivalent of `Facter::Util::Config.external_facts_dirs`.

This commit also makes sure that version 4.0 or higher is installed.
This commit is contained in:
Jarek Radosz
2020-05-30 01:03:40 +02:00
parent 8c8391c742
commit 4babdf510b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
script/bench.rb
View File

@@ -68,10 +68,9 @@ end
begin begin
require 'facter' require 'facter'
raise LoadError if Gem::Version.new(Facter.version) < Gem::Version.new("4.0")
rescue LoadError rescue LoadError
run "gem install facter" run "gem install facter"
# Facter requires CFPropertyList, but doesn't install it.
run "gem install CFPropertyList"
puts "please rerun script" puts "please rerun script"
exit exit
end end
@@ -286,7 +285,7 @@ begin
# Prevent using external facts because it breaks when running in the # Prevent using external facts because it breaks when running in the
# discourse/discourse_bench docker container. # discourse/discourse_bench docker container.
Facter::Util::Config.external_facts_dirs = [] Facter.reset
facts = Facter.to_hash facts = Facter.to_hash
facts.delete_if { |k, v| facts.delete_if { |k, v|