Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2017-06-22 10:35:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Thu Jun 22 10:35:11 2017 rev:182 rq:504988 version:3.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2017-03-29 13:22:53.502705908 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2017-06-22 10:35:12.557469742 +0200 @@ -1,0 +2,7 @@ +Mon Jun 19 14:45:17 UTC 2017 - [email protected] + +- Alterations in vconsole.conf performed by localectl and not + directly by YaST (bsc#1023774). +- 3.2.12 + +------------------------------------------------------------------- Old: ---- yast2-country-3.2.11.tar.bz2 New: ---- yast2-country-3.2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.8bc745/_old 2017-06-22 10:35:13.149386303 +0200 +++ /var/tmp/diff_new_pack.8bc745/_new 2017-06-22 10:35:13.149386303 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.11 +Version: 3.2.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.2.11.tar.bz2 -> yast2-country-3.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.11/keyboard/src/modules/Keyboard.rb new/yast2-country-3.2.12/keyboard/src/modules/Keyboard.rb --- old/yast2-country-3.2.11/keyboard/src/modules/Keyboard.rb 2017-03-24 10:23:53.451701869 +0100 +++ new/yast2-country-3.2.12/keyboard/src/modules/Keyboard.rb 2017-06-20 09:46:51.641714053 +0200 @@ -885,9 +885,11 @@ ) SCR.Write(path(".sysconfig.keyboard"), nil) # flush - # Write systemd settings for console - SCR.Write(path(".etc.vconsole_conf.KEYMAP"), @keymap.gsub(/(.*)\.map\.gz/, '\1')) - SCR.Write(path(".etc.vconsole_conf"), nil) # flush + cmd = "/usr/bin/localectl --no-convert set-keymap #{@keymap.gsub(/(.*)\.map\.gz/, '\1')}" + log.info "Making console keyboard persistent: #{cmd}" + if SCR.Execute(path(".target.bash"), cmd) != 0 + log.error "Console keyboard configuration not written. Failed to execute '#{cmd}'" + end # Write systemd settings for X11 call_set_x11_keymap if x11_setup_needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.11/keyboard/test/keyboard_test.rb new/yast2-country-3.2.12/keyboard/test/keyboard_test.rb --- old/yast2-country-3.2.11/keyboard/test/keyboard_test.rb 2017-03-24 10:23:53.491701869 +0100 +++ new/yast2-country-3.2.12/keyboard/test/keyboard_test.rb 2017-06-20 09:46:51.641714053 +0200 @@ -74,6 +74,9 @@ expect(SCR).to execute_bash( /localectl --no-convert set-x11-keymap es microsoftpro$/ ) + expect(SCR).to execute_bash( + /localectl --no-convert set-keymap es$/ + ) expect(AsciiFile).to receive(:AppendLine).with(anything, ["Keytable:", "es.map.gz"]) Keyboard.Set("spanish") @@ -81,8 +84,6 @@ expect(written_value_for(".sysconfig.keyboard.YAST_KEYBOARD")).to eq("spanish,pc104") expect(written_value_for(".sysconfig.keyboard")).to be_nil - expect(written_value_for(".etc.vconsole_conf.KEYMAP")).to eq("es") - expect(written_value_for(".etc.vconsole_conf")).to be_nil end it "doesn't regenerate initrd" do @@ -104,14 +105,15 @@ expect(SCR).to execute_bash( /localectl --no-convert set-x11-keymap us,ru microsoftpro ,winkeys grp:ctrl_shift_toggle,grp_led:scroll$/ ) + expect(SCR).to execute_bash( + /localectl --no-convert set-keymap ruwin_alt-UTF-8$/ + ) Keyboard.Set("russian") Keyboard.Save expect(written_value_for(".sysconfig.keyboard.YAST_KEYBOARD")).to eq("russian,pc104") expect(written_value_for(".sysconfig.keyboard")).to be_nil - expect(written_value_for(".etc.vconsole_conf.KEYMAP")).to eq("ruwin_alt-UTF-8") - expect(written_value_for(".etc.vconsole_conf")).to be_nil end it "does regenerate initrd" do @@ -541,8 +543,12 @@ describe "#Summary" do it "retuns an HTML containing the current layout" do Keyboard.SetKeyboard("spanish") + # do not place translations to regexps or string interpolations + # see bsc#1038077 for details, make sure the translation does + # not contain special chars by accident + label = Regexp.escape(_("Spanish")) expect(Keyboard.Summary) - .to match /<li.*#{_("Spanish")}.*li>/ + .to match /<li.*#{label}.*li>/ end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.11/package/yast2-country.changes new/yast2-country-3.2.12/package/yast2-country.changes --- old/yast2-country-3.2.11/package/yast2-country.changes 2017-03-24 10:23:53.555701869 +0100 +++ new/yast2-country-3.2.12/package/yast2-country.changes 2017-06-20 09:46:51.649714053 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 19 14:45:17 UTC 2017 - [email protected] + +- Alterations in vconsole.conf performed by localectl and not + directly by YaST (bsc#1023774). +- 3.2.12 + +------------------------------------------------------------------- Thu Mar 23 18:45:42 UTC 2017 - [email protected] - Fix GetLocaleString to use the given locale instead of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.11/package/yast2-country.spec new/yast2-country-3.2.12/package/yast2-country.spec --- old/yast2-country-3.2.11/package/yast2-country.spec 2017-03-24 10:23:53.555701869 +0100 +++ new/yast2-country-3.2.12/package/yast2-country.spec 2017-06-20 09:46:51.649714053 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.11 +Version: 3.2.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build
