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

M #-: Add RSunstone patch files (#6738)

Browse Source 
Signed-off-by: Victor Hansson <vhansson@opennebula.io>
This commit is contained in:
vichansson 2024-09-26 16:59:57 +03:00 committed by GitHub
parent bf030d2b6e
commit c0c8bc2b92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/sunstone/patches/SunstoneViews.patch Normal file
View File

@ -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
src/sunstone/patches/sunstone-server.patch Normal file
View File

@ -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, ""