shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

B #-: Fix loading YAML with aliases (#3194)

Browse Source 
+ make empty YAML load backward comp.
This commit is contained in:
Jan Orel 2024-09-05 16:48:31 +02:00 committed by GitHub
parent 97237d6f3c
commit 9f77a06745
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/onecfg/lib/config/type/yaml.rb
View File

@ -41,7 +41,15 @@ module OneCfg::Config::Type
def load(name = @name)
reset
@content = YAML.load_file(name)
if Gem::Version.new(Psych.const_get(:VERSION)) >= Gem::Version.new('4.0')
@content = YAML.load_file(name, :aliases => true)
# for backward compatibility with older Psych return `false`
# instead of `nil` if the file was empty
@content = false if @content.nil?
else
@content = YAML.load_file(name)
end
@content
end

6
src/onecfg/lib/patch/apply.rb
View File

@ -165,7 +165,11 @@ module OneCfg::Patch
#
# @param filename [String] path to patch in YAML format
def parse_yaml(filename)
@patches = YAML.load_file(filename)
if Psych::VERSION > '4.0'
@patches = YAML.load_file(filename, :aliases => true)
else
@patches = YAML.load_file(filename)
end
return if @patches.is_a?(Hash)

6
src/onecfg/lib/settings.rb
View File

@ -42,7 +42,11 @@ module OneCfg
reset
if ::File.exist?(@name)
@content = YAML.load_file(@name)
if Psych::VERSION > '4.0'
@content = YAML.load_file(@name, :aliases => true)
else
@content = YAML.load_file(@name)
end
end
rescue StandardError => e
OneCfg::LOG.error("Can't load settings from '#{@name}' " \