Hello community, here is the log from the commit of package live-langset-data for openSUSE:Factory checked in at 2018-10-31 13:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-langset-data (Old) and /work/SRC/openSUSE:Factory/.live-langset-data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "live-langset-data" Wed Oct 31 13:21:49 2018 rev:9 rq:645689 version:2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/live-langset-data/live-langset-data.changes 2018-06-19 12:01:57.565828169 +0200 +++ /work/SRC/openSUSE:Factory/.live-langset-data.new/live-langset-data.changes 2018-10-31 13:22:14.675012393 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 09:19:22 UTC 2018 - Fabian Vogt <fvogt@suse.com> + +- Support the conversion to json in yast2-country done for bsc#1013573 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-langset-data.spec ++++++ --- /var/tmp/diff_new_pack.kAAMR1/_old 2018-10-31 13:22:15.115011983 +0100 +++ /var/tmp/diff_new_pack.kAAMR1/_new 2018-10-31 13:22:15.115011983 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # ++++++ getcountrydata.rb ++++++ --- /var/tmp/diff_new_pack.kAAMR1/_old 2018-10-31 13:22:15.139011961 +0100 +++ /var/tmp/diff_new_pack.kAAMR1/_new 2018-10-31 13:22:15.143011957 +0100 @@ -1,5 +1,7 @@ # encoding: utf-8 +require "json" + module Yast class GetcountrydataClient < Client def main @@ -9,9 +11,17 @@ Yast.import "OSRelease" langs = Language.GetLanguagesMap(true) + + consolefonts = nil + datafilepath = Directory.find_data_file("consolefonts.json") + + if datafilepath.nil? + consolefonts = SCR.Read(path(".target.yast2"), "consolefonts_#{OSRelease.id}.ycp") + consolefonts ||= SCR.Read(path(".target.yast2"), "consolefonts.ycp") + else + consolefonts = JSON.load(File.read(datafilepath)) + end - consolefonts = SCR.Read(path(".target.yast2"), "consolefonts_#{OSRelease.id}.ycp") - consolefonts ||= SCR.Read(path(".target.yast2"), "consolefonts.ycp") timezonemap = Language.GetLang2TimezoneMap(true) dir = ENV["OUTPUTDIR"] @@ -31,10 +41,17 @@ consolefont = consolefonts[lang[0,2]] end consolefont ||= [] - font = consolefont[0] || "" - unicodeMap = consolefont[1] || "" - screenMap = consolefont[2] || "" - magic = consolefont[3] || "" + if consolefont.is_a?(Hash) + font = consolefont["font"] || "" + unicodeMap = consolefont["unicodeMap"] || "" + screenMap = consolefont["screenMap"] || "" + magic = consolefont["magic"] || "" + else + font = consolefont[0] || "" + unicodeMap = consolefont[1] || "" + screenMap = consolefont[2] || "" + magic = consolefont[3] || "" + end timezone = timezonemap[lang] || "" contents = "RC_LANG='#{fqlanguage}'\n" +