Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-02-12 10:07:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Mon Feb 12 10:07:32 2018 rev:191 rq:574775 version:4.0.20 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-02-02 22:18:24.712716734 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2018-02-12 10:07:36.793942399 +0100 @@ -1,0 +2,7 @@ +Fri Feb 9 16:41:49 UTC 2018 - ancor@suse.com + +- Keyboard: don't try to set the keyboard map for AMBA devices, + e.g. /dev/ttyAMA0 (bsc#1080222). +- 4.0.20 + +------------------------------------------------------------------- Old: ---- yast2-country-4.0.19.tar.bz2 New: ---- yast2-country-4.0.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.awDrRj/_old 2018-02-12 10:07:37.749907946 +0100 +++ /var/tmp/diff_new_pack.awDrRj/_new 2018-02-12 10:07:37.753907802 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.19 +Version: 4.0.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-4.0.19.tar.bz2 -> yast2-country-4.0.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.19/keyboard/src/modules/Keyboard.rb new/yast2-country-4.0.20/keyboard/src/modules/Keyboard.rb --- old/yast2-country-4.0.19/keyboard/src/modules/Keyboard.rb 2018-01-30 13:55:59.000000000 +0100 +++ new/yast2-country-4.0.20/keyboard/src/modules/Keyboard.rb 2018-02-09 18:26:18.000000000 +0100 @@ -532,9 +532,7 @@ return false # Error end - # Console command. It specifies all tty devices (bsc#1010938) - @tty_devices ||= Dir["/dev/tty*"].map { |d| "-C #{d}" }.join(" ") - @ckb_cmd = "/bin/loadkeys #{@tty_devices} #{keymap}" + @ckb_cmd = "/bin/loadkeys #{loadkeys_devices} #{keymap}" # X11 command... # do not try to run this with remote X display @@ -1427,6 +1425,17 @@ # eval is necessary for translating the texts needed to be translated content ? Builtins.eval(content) : {} end + + # String to specify all the relevant devices in a loadkeys command + # + # It includes all tty devices (bsc#1010938) except those representing + # AMBA devices (bsc#1080222). + # + # @return [String] ready to be passed to the loadkeys command + def loadkeys_devices + tty_dev_names = Dir["/dev/tty*"].grep_v(/ttyAMA/) + tty_dev_names.map { |d| "-C #{d}" }.join(" ") + end end Keyboard = KeyboardClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.19/keyboard/test/keyboard_test.rb new/yast2-country-4.0.20/keyboard/test/keyboard_test.rb --- old/yast2-country-4.0.19/keyboard/test/keyboard_test.rb 2018-01-30 13:55:59.000000000 +0100 +++ new/yast2-country-4.0.20/keyboard/test/keyboard_test.rb 2018-02-09 18:26:18.000000000 +0100 @@ -159,6 +159,24 @@ Keyboard.Set("russian") end + + context "if there are AMBA devices in the system" do + before do + allow(Dir).to receive(:[]).and_return( + ["/dev/tty1", "/dev/ttyAMA0", "/dev/ttyS0"] + ) + end + + it "does not try to set the keymap for /dev/ttyAMA devices" do + expect(SCR).to receive(:Execute) do |path, command| + expect(path).to eq path(".target.bash") + expect(command).to include "loadkeys -C /dev/tty1 -C /dev/ttyS0 ruwin_alt-UTF-8" + expect(command).to_not include "/dev/ttyAMA0" + end + + Keyboard.Set("russian") + end + end end describe "#SetX11" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.19/package/yast2-country.changes new/yast2-country-4.0.20/package/yast2-country.changes --- old/yast2-country-4.0.19/package/yast2-country.changes 2018-01-30 13:55:59.000000000 +0100 +++ new/yast2-country-4.0.20/package/yast2-country.changes 2018-02-09 18:26:18.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 9 16:41:49 UTC 2018 - ancor@suse.com + +- Keyboard: don't try to set the keyboard map for AMBA devices, + e.g. /dev/ttyAMA0 (bsc#1080222). +- 4.0.20 + +------------------------------------------------------------------- Tue Jan 30 12:50:29 UTC 2018 - jreidinger@suse.com - Lnaguage: nicer handling of dbus timeout (bsc#1076804) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.19/package/yast2-country.spec new/yast2-country-4.0.20/package/yast2-country.spec --- old/yast2-country-4.0.19/package/yast2-country.spec 2018-01-30 13:55:59.000000000 +0100 +++ new/yast2-country-4.0.20/package/yast2-country.spec 2018-02-09 18:26:18.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.19 +Version: 4.0.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build