Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2019-02-28 21:48:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Thu Feb 28 21:48:46 2019 rev:200 rq:680111 version:4.1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2019-02-24 18:02:36.067790932 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new.28833/yast2-country.changes 2019-02-28 21:48:46.765387351 +0100
@@ -1,0 +2,8 @@
+Thu Feb 28 09:28:43 UTC 2019 - José Iván López González
+
+- Fix OS detection and use correct keyboard file for opensuse
+ (bsc#1124921).
+- Remove incompatible Lithuanian layout from opensuse file.
+- 4.1.9
+
+-------------------------------------------------------------------
Old:
----
yast2-country-4.1.8.tar.bz2
New:
----
yast2-country-4.1.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.ptU8zG/_old 2019-02-28 21:48:47.397387082 +0100
+++ /var/tmp/diff_new_pack.ptU8zG/_new 2019-02-28 21:48:47.409387076 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 4.1.8
+Version: 4.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-country-4.1.8.tar.bz2 -> yast2-country-4.1.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.8/keyboard/src/data/keyboard_raw.ycp new/yast2-country-4.1.9/keyboard/src/data/keyboard_raw.ycp
--- old/yast2-country-4.1.8/keyboard/src/data/keyboard_raw.ycp 2019-02-18 12:44:15.000000000 +0100
+++ new/yast2-country-4.1.9/keyboard/src/data/keyboard_raw.ycp 2019-02-28 13:33:14.000000000 +0100
@@ -452,7 +452,7 @@
// keyboard layout
_("Lithuanian"),
$[
- "pc104" : $[ "ncurses": "lt.baltic.map.gz"],
+ "pc104" : $[ "ncurses": "lt.map.gz"],
"macintosh" : $[ "ncurses": "mac-us.map.gz"],
"type4" : $[ "ncurses": "sunkeymap.map.gz"],
"type5" : $[ "ncurses": "sunkeymap.map.gz"],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.8/keyboard/src/modules/Keyboard.rb new/yast2-country-4.1.9/keyboard/src/modules/Keyboard.rb
--- old/yast2-country-4.1.8/keyboard/src/modules/Keyboard.rb 2019-02-18 12:44:15.000000000 +0100
+++ new/yast2-country-4.1.9/keyboard/src/modules/Keyboard.rb 2019-02-28 13:33:14.000000000 +0100
@@ -1416,10 +1416,10 @@
# Keyboards map
#
- # The map can be read from two different files:
+ # The map can be read from two different files, see {#keyboard_file}:
#
- # * `keyboard_raw_ID.ycp` where ID is the distribution identifier (as
- # specified in /etc/os-release). For example, `keyboard_raw_opensuse.ycp`.
+ # * `keyboard_raw_opensuse.ycp` when it is an opensuse distribution (according
+ # to the distribution id specified in /etc/os-release).
# * `keyboard_raw.ycp` as a fallback.
#
# @example Keyboards map format
@@ -1442,13 +1442,23 @@
#
# @return [Hash] Keyboards map. See the example for content details.
def all_keyboards
- content = SCR.Read(path(".target.yast2"), "keyboard_raw_#{OSRelease.id}.ycp")
- content ||= SCR.Read(path(".target.yast2"), "keyboard_raw.ycp")
+ content = SCR.Read(path(".target.yast2"), keyboard_file)
# eval is necessary for translating the texts needed to be translated
content ? Builtins.eval(content) : {}
end
+ # Keyboard file to use depending on the distribution
+ #
+ # @return [String]
+ def keyboard_file
+ if OSRelease.id.match?(/opensuse/i)
+ "keyboard_raw_opensuse.ycp"
+ else
+ "keyboard_raw.ycp"
+ end
+ end
+
# String to specify all the relevant devices in a loadkeys command
#
# It includes all tty devices (bsc#1010938) except those representing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.8/keyboard/test/keyboard_test.rb new/yast2-country-4.1.9/keyboard/test/keyboard_test.rb
--- old/yast2-country-4.1.8/keyboard/test/keyboard_test.rb 2019-02-18 12:44:15.000000000 +0100
+++ new/yast2-country-4.1.9/keyboard/test/keyboard_test.rb 2019-02-28 13:33:14.000000000 +0100
@@ -26,7 +26,7 @@
describe "Keyboard" do
let(:udev_file) { "/usr/lib/udev/rules.d/70-installation-keyboard.rules" }
- let(:os_release_id) { "opensuse" }
+ let(:os_release_id) { "opensuse-leap" }
let(:mode) { "normal" }
let(:stage) { "normal" }
@@ -76,7 +76,7 @@
let(:new_lang) { "spanish" }
it "writes the configuration" do
- expect(WFM).to receive(:Execute).with(path(".local.bash_output"),
+ expect(WFM).to receive(:Execute).with(path(".local.bash_output"),
"/usr/bin/systemd-firstboot --root /mnt --keymap es").and_return("exit" => 0)
expect(AsciiFile).to receive(:AppendLine).with(anything, ["Keytable:", "es.map.gz"])
@@ -638,7 +638,6 @@
let(:chroot) { "spanish" }
let(:mode) { "normal" }
let(:stage) { "normal" }
- let(:os_release_id) { "sles" }
let(:kb_model) { "macintosh" }
before { allow(Yast::OSRelease).to receive(:id).and_return(os_release_id) }
@@ -650,19 +649,23 @@
Keyboard.kb_model = old_kb_model
end
- it "returns generic version of the keyboard map" do
- reduced_db = Keyboard.get_reduced_keyboard_db
- expect(reduced_db["russian"].last["ncurses"])
- .to eq("mac-us.map.gz")
+ context "when using an opensuse product" do
+ let(:os_release_id) { "opensuse-leap" }
+
+ it "returns the opensuse version of the keyboard map" do
+ reduced_db = Keyboard.get_reduced_keyboard_db
+ expect(reduced_db["russian"].last["ncurses"])
+ .to eq("us-mac.map.gz")
+ end
end
- context "when using a product with an specific keyboard map" do
- let(:os_release_id) { "opensuse" }
+ context "when not using an opensuse product" do
+ let(:os_release_id) { "sles" }
- it "returns the specific version of the keyboard map" do
+ it "returns generic version of the keyboard map" do
reduced_db = Keyboard.get_reduced_keyboard_db
expect(reduced_db["russian"].last["ncurses"])
- .to eq("us-mac.map.gz")
+ .to eq("mac-us.map.gz")
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.8/package/yast2-country.changes new/yast2-country-4.1.9/package/yast2-country.changes
--- old/yast2-country-4.1.8/package/yast2-country.changes 2019-02-18 12:44:15.000000000 +0100
+++ new/yast2-country-4.1.9/package/yast2-country.changes 2019-02-28 13:33:14.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Feb 28 09:28:43 UTC 2019 - José Iván López González
+
+- Fix OS detection and use correct keyboard file for opensuse
+ (bsc#1124921).
+- Remove incompatible Lithuanian layout from opensuse file.
+- 4.1.9
+
+-------------------------------------------------------------------
Mon Feb 18 11:36:47 UTC 2019 - snwint@suse.com
- fix timezone setting when switching utc/local time (bsc#1087228)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.1.8/package/yast2-country.spec new/yast2-country-4.1.9/package/yast2-country.spec
--- old/yast2-country-4.1.8/package/yast2-country.spec 2019-02-18 12:44:15.000000000 +0100
+++ new/yast2-country-4.1.9/package/yast2-country.spec 2019-02-28 13:33:14.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 4.1.8
+Version: 4.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build