Skip to content

Commit

Permalink
M #-: Add RSunstone patch files (#6738)
Browse files Browse the repository at this point in the history
Signed-off-by: Victor Hansson <vhansson@opennebula.io>
  • Loading branch information
vichansson authored Sep 26, 2024
1 parent bf030d2 commit c0c8bc2
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 0 deletions.
28 changes: 28 additions & 0 deletions src/sunstone/patches/SunstoneViews.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- SunstoneViews.rb 2024-09-05 17:07:42.000000000 +0300
+++ SunstoneViews.rb 2024-09-23 17:34:54.248170982 +0300
@@ -35,7 +35,11 @@

raise "Sunstone configuration file does not contain default view mode, aborting" if mode.nil?

- @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
+ if Psych::VERSION > '4.0'
+ @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE, aliases: true)
+ else
+ @views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
+ end

base_path = SUNSTONE_ROOT_DIR+'/public/js/'

@@ -49,7 +53,11 @@
reg = VIEWS_CONFIGURATION_DIR + mode + '/'
m = p_path.match(/^#{reg}(.*).yaml$/)
if m && m[1]
- @views[m[1]] = YAML.load_file(p_path)
+ if Psych::VERSION > '4.0'
+ @views[m[1]] = YAML.load_file(p_path, aliases: true)
+ else
+ @views[m[1]] = YAML.load_file(p_path)
+ end
end
end
end
28 changes: 28 additions & 0 deletions src/sunstone/patches/sunstone-server.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- sunstone-server.rb 17:00:40.261753994 +0300
+++ sunstone-server.rb 17:29:04.665081589 +0300
@@ -158,7 +158,11 @@
##############################################################################

begin
- $conf = YAML.load_file(CONFIGURATION_FILE)
+ if Psych::VERSION > '4.0'
+ $conf = YAML.load_file(CONFIGURATION_FILE, aliases: true)
+ else
+ $conf = YAML.load_file(CONFIGURATION_FILE)
+ end
rescue Exception => e
STDERR.puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
exit 1
@@ -359,7 +363,11 @@
def build_conf_locals
logos_conf = nil
begin
- logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
+ if Psych::VERSION > '4.0'
+ logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE, aliases: true)
+ else
+ logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
+ end
rescue Exception => e
logger.error { "Error parsing config file #{LOGOS_CONFIGURATION_FILE}: #{e.message}" }
error 500, ""

0 comments on commit c0c8bc2

Please sign in to comment.