From 650fb59cc5a1c4644cdf7648409c8c8f9520c623 Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Fri, 2 Aug 2024 19:15:26 +0200 Subject: [PATCH] B #-: Fix loading YAML with aliases (#3190) --- src/onecfg/lib/patch/apply.rb | 6 +++++- src/onecfg/lib/settings.rb | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/onecfg/lib/patch/apply.rb b/src/onecfg/lib/patch/apply.rb index a4f027faa48..5a536910645 100644 --- a/src/onecfg/lib/patch/apply.rb +++ b/src/onecfg/lib/patch/apply.rb @@ -165,7 +165,11 @@ def apply(all = true) # # @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) diff --git a/src/onecfg/lib/settings.rb b/src/onecfg/lib/settings.rb index f713cb610e0..45b321e697e 100644 --- a/src/onecfg/lib/settings.rb +++ b/src/onecfg/lib/settings.rb @@ -42,7 +42,11 @@ def load reset if ::File.exist?(@name) - @content = YAML.load_file(@name) + if Psych::VERSION > '4.0' + @content = YAML.load_file(@name, :alises => true) + else + @content = YAML.load_file(@name) + end end rescue StandardError => e OneCfg::LOG.error("Can't load settings from '#{@name}' " \