Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2020-01-24 14:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Fri Jan 24 14:10:51 2020 rev:210 rq:766628 version:4.2.17 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2020-01-04 19:21:02.201129140 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new.26092/yast2-country.changes 2020-01-24 14:10:58.154405525 +0100 @@ -1,0 +2,21 @@ +Thu Jan 23 13:21:01 UTC 2020 - Josef Reidinger <[email protected]> + +- Fix exit codes for CLI for language, timezone and keyboard + (bsc#1160928) +- 4.2.17 + +------------------------------------------------------------------- +Thu Jan 23 12:45:13 UTC 2020 - Steffen Winterfeldt <[email protected]> + +- don't use /bin/systemctl compat symlink (bsc#1160890) +- 4.2.16 + +------------------------------------------------------------------- +Mon Jan 20 16:35:45 CET 2020 - [email protected] + +- Keyboard definition in the AY configuration file: Alias AND + keymap name is supported (bsc#1159541). +- Reporting a warning if the defined keymap has not been found. +- 4.2.15 + +------------------------------------------------------------------- Old: ---- yast2-country-4.2.14.tar.bz2 New: ---- yast2-country-4.2.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.uYNDgo/_old 2020-01-24 14:10:59.186405874 +0100 +++ /var/tmp/diff_new_pack.uYNDgo/_new 2020-01-24 14:10:59.186405874 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.2.14 +Version: 4.2.17 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only @@ -38,14 +38,14 @@ BuildRequires: yast2-core >= 3.1.12 # RSpec extensions for YaST BuildRequires: yast2-ruby-bindings >= 3.1.26 -# OSRelease.id -BuildRequires: yast2 >= 3.2.9 +# Yast2::CommandLine readonly parameter +BuildRequires: yast2 >= 4.2.57 Requires: timezone Requires: yast2-perl-bindings Requires: yast2-trans-stats -# OSRelease.id -Requires: yast2 >= 3.2.9 +# Yast2::CommandLine readonly parameter +Requires: yast2 >= 4.2.57 # Pkg::SetPackageLocale, Pkg::GetTextLocale Requires: yast2-pkg-bindings >= 2.15.3 # IconPath support for MultiSelectionBox ++++++ yast2-country-4.2.14.tar.bz2 -> yast2-country-4.2.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/keyboard/src/clients/keyboard.rb new/yast2-country-4.2.17/keyboard/src/clients/keyboard.rb --- old/yast2-country-4.2.14/keyboard/src/clients/keyboard.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/keyboard/src/clients/keyboard.rb 2020-01-23 15:23:38.000000000 +0100 @@ -20,12 +20,13 @@ "finish" => fun_ref(method(:KeyboardWrite), "boolean ()"), "actions" => { "summary" => { - "handler" => fun_ref( + "handler" => fun_ref( method(:KeyboardSummaryHandler), "boolean (map)" ), # command line help text for 'summary' action - "help" => _("Keyboard configuration summary.") + "help" => _("Keyboard configuration summary."), + "readonly" => true }, "set" => { "handler" => fun_ref(method(:KeyboardSetHandler), "boolean (map)"), @@ -33,9 +34,10 @@ "help" => _("Set new values for keyboard configuration.") }, "list" => { - "handler" => fun_ref(method(:KeyboardListHandler), "boolean (map)"), + "handler" => fun_ref(method(:KeyboardListHandler), "boolean (map)"), # command line help text for 'list' action - "help" => _("List all available keyboard layouts.") + "help" => _("List all available keyboard layouts."), + "readonly" => true } }, "options" => { @@ -75,7 +77,7 @@ def KeyboardSummaryHandler(options) # summary label CommandLine.Print(_("Current Keyboard Layout: %s" % Keyboard.current_kbd)) - false + true end # Handler for listing keyboard layouts @@ -83,7 +85,7 @@ Keyboard.Selection.each do |code, name| CommandLine.Print(Builtins.sformat("%1 (%2)", code, name)) end - false + true end # Handler for changing keyboard settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/keyboard/src/modules/Keyboard.rb new/yast2-country-4.2.17/keyboard/src/modules/Keyboard.rb --- old/yast2-country-4.2.14/keyboard/src/modules/Keyboard.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/keyboard/src/modules/Keyboard.rb 2020-01-23 15:23:38.000000000 +0100 @@ -46,6 +46,7 @@ Yast.import "Mode" Yast.import "ProductFeatures" Yast.import "Stage" + Yast.import "Report" # general kb strategy which is used for temporary changes only. @kb_strategy = Y2Keyboard::Strategies::KbStrategy.new @@ -281,6 +282,21 @@ when :language keyboard = GetKeyboardForLanguage(settings["language"], keyboard) end + + # Checking if the keymap exists. Either it is the real keymap name + # or an alias. + if !Keyboards.code(keyboard) + # Checking if it a real keymap name + checked_keyboard = keyboard + keyboard = Keyboards.alias(checked_keyboard) + if !keyboard + # TRANSLATORS: the "%s" is the kaymap name + Report.Warning(_("Cannot find keymap: %s. Taking default one.") % checked_keyboard) + return false + end + end + + # Set it with the keyboard alias name Set(keyboard) true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/keyboard/test/keyboard_spec.rb new/yast2-country-4.2.17/keyboard/test/keyboard_spec.rb --- old/yast2-country-4.2.14/keyboard/test/keyboard_spec.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/keyboard/test/keyboard_spec.rb 2020-01-23 15:23:38.000000000 +0100 @@ -216,6 +216,21 @@ subject.Import({"language" => "de"}, :language) end end + + context "keymap value is given instead of an alias name" do + it "sets the alias name" do + expect(subject).to receive(:Set).with("spanish") + subject.Import({"keymap" => "es"}, :keyboard) + end + end + + context "keymap is unknown" do + it "reports a warning" do + expect(subject).not_to receive(:Set) + expect(Yast::Report).to receive(:Warning).with(/Cannot find keymap/) + subject.Import({"keymap" => "foo"}, :keyboard) + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/language/src/clients/language.rb new/yast2-country-4.2.17/language/src/clients/language.rb --- old/yast2-country-4.2.14/language/src/clients/language.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/language/src/clients/language.rb 2020-01-23 15:23:38.000000000 +0100 @@ -61,14 +61,15 @@ "finish" => fun_ref(method(:LanguageWrite), "boolean ()"), "actions" => { "summary" => { - "handler" => fun_ref( + "handler" => fun_ref( method(:LanguageSummaryHandler), "boolean (map)" ), # command line help text for 'summary' action - "help" => _( + "help" => _( "Language configuration summary" - ) + ), + "readonly" => true }, "set" => { "handler" => fun_ref(method(:LanguageSetHandler), "boolean (map)"), @@ -78,11 +79,12 @@ ) }, "list" => { - "handler" => fun_ref(method(:LanguageListHandler), "boolean (map)"), + "handler" => fun_ref(method(:LanguageListHandler), "boolean (map)"), # command line help text for 'list' action - "help" => _( + "help" => _( "List all available languages." - ) + ), + "readonly" => true } }, "options" => { @@ -115,7 +117,6 @@ } CommandLine.Run(@cmdline) - true end # read language settings @@ -269,7 +270,7 @@ ) end end - false + true end # Handler for listing available languages @@ -284,10 +285,9 @@ ) ) end - false + true end - # Handler for changing language settings def LanguageSetHandler(options) options = deep_copy(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/package/yast2-country.changes new/yast2-country-4.2.17/package/yast2-country.changes --- old/yast2-country-4.2.14/package/yast2-country.changes 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/package/yast2-country.changes 2020-01-23 15:23:38.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Thu Jan 23 13:21:01 UTC 2020 - Josef Reidinger <[email protected]> + +- Fix exit codes for CLI for language, timezone and keyboard + (bsc#1160928) +- 4.2.17 + +------------------------------------------------------------------- +Thu Jan 23 12:45:13 UTC 2020 - Steffen Winterfeldt <[email protected]> + +- don't use /bin/systemctl compat symlink (bsc#1160890) +- 4.2.16 + +------------------------------------------------------------------- +Mon Jan 20 16:35:45 CET 2020 - [email protected] + +- Keyboard definition in the AY configuration file: Alias AND + keymap name is supported (bsc#1159541). +- Reporting a warning if the defined keymap has not been found. +- 4.2.15 + +------------------------------------------------------------------- Thu Jan 2 15:13:06 UTC 2020 - Josef Reidinger <[email protected]> - Do not crash when unknown keymap is set on system (bsc#1159286) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/package/yast2-country.spec new/yast2-country-4.2.17/package/yast2-country.spec --- old/yast2-country-4.2.14/package/yast2-country.spec 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/package/yast2-country.spec 2020-01-23 15:23:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.2.14 +Version: 4.2.17 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only @@ -38,14 +38,14 @@ BuildRequires: yast2-core >= 3.1.12 # RSpec extensions for YaST BuildRequires: yast2-ruby-bindings >= 3.1.26 -# OSRelease.id -BuildRequires: yast2 >= 3.2.9 +# Yast2::CommandLine readonly parameter +BuildRequires: yast2 >= 4.2.57 Requires: timezone Requires: yast2-perl-bindings Requires: yast2-trans-stats -# OSRelease.id -Requires: yast2 >= 3.2.9 +# Yast2::CommandLine readonly parameter +Requires: yast2 >= 4.2.57 # Pkg::SetPackageLocale, Pkg::GetTextLocale Requires: yast2-pkg-bindings >= 2.15.3 # IconPath support for MultiSelectionBox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/timezone/src/clients/timezone.rb new/yast2-country-4.2.17/timezone/src/clients/timezone.rb --- old/yast2-country-4.2.14/timezone/src/clients/timezone.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/timezone/src/clients/timezone.rb 2020-01-23 15:23:38.000000000 +0100 @@ -57,14 +57,15 @@ "finish" => fun_ref(method(:TimezoneWrite), "boolean ()"), "actions" => { "summary" => { - "handler" => fun_ref( + "handler" => fun_ref( method(:TimezoneSummaryHandler), "boolean (map)" ), # command line help text for 'summary' action - "help" => _( + "help" => _( "Time zone configuration summary" - ) + ), + "readonly" => true }, "set" => { "handler" => fun_ref(method(:TimezoneSetHandler), "boolean (map)"), @@ -74,11 +75,12 @@ ) }, "list" => { - "handler" => fun_ref(method(:TimezoneListHandler), "boolean (map)"), + "handler" => fun_ref(method(:TimezoneListHandler), "boolean (map)"), # command line help text for 'list' action - "help" => _( + "help" => _( "List all available time zones" - ) + ), + "readonly" => true } }, "options" => { @@ -106,7 +108,6 @@ } CommandLine.Run(@cmdline) - true end # read timezone settings (store initial values) @@ -181,7 +182,7 @@ Timezone.GetDateTime(true, true) ) ) - false + true end # Handler for listing timezone layouts @@ -197,7 +198,7 @@ CommandLine.Print(Builtins.sformat("%1 (%2)", code, name)) end end - false + true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/timezone/src/modules/Timezone.rb new/yast2-country-4.2.17/timezone/src/modules/Timezone.rb --- old/yast2-country-4.2.14/timezone/src/modules/Timezone.rb 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/timezone/src/modules/Timezone.rb 2020-01-23 15:23:38.000000000 +0100 @@ -295,7 +295,7 @@ SCR.Execute(path(".target.bash_output"), cmd) ) unless Stage.initial - cmd = "/bin/systemctl try-restart systemd-timedated.service" + cmd = "/usr/bin/systemctl try-restart systemd-timedated.service" Builtins.y2milestone( "restarting timedated service: %1", SCR.Execute(path(".target.bash_output"), cmd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.2.14/timezone/testsuite/tests/MakeProposal.out new/yast2-country-4.2.17/timezone/testsuite/tests/MakeProposal.out --- old/yast2-country-4.2.14/timezone/testsuite/tests/MakeProposal.out 2020-01-02 16:22:14.000000000 +0100 +++ new/yast2-country-4.2.17/timezone/testsuite/tests/MakeProposal.out 2020-01-23 15:23:38.000000000 +0100 @@ -2,7 +2,7 @@ Read .probe.is_vmware false Read .target.yast2 "timezone_raw.ycp" [$["entries":$["Europe/Berlin":"Germany", "Europe/Prague":"Czech Republic"], "name":"Europe"]] Execute .target.bash_output "/usr/sbin/zic -l Europe/Prague" $[] -Execute .target.bash_output "/bin/systemctl try-restart systemd-timedated.service" $[] +Execute .target.bash_output "/usr/bin/systemctl try-restart systemd-timedated.service" $[] Execute .target.bash_output "/sbin/hwclock --hctosys -u" $[] Execute .target.bash_output "/bin/date \"+%c\"" $[] Return ["Europe / Czech Republic - Hardware Clock Set To UTC "]
