Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at 2014-08-25 11:03:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes
2014-08-14 14:57:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes
2014-08-25 11:03:33.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 21 13:45:58 UTC 2014 - an...@suse.com
+
+- Persisted X11 keyboard configuration using localectl (bnc#892303)
+- 3.1.11
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.1.10.tar.bz2
New:
----
yast2-country-3.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.Hexpd4/_old 2014-08-25 11:03:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Hexpd4/_new 2014-08-25 11:03:35.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-country-3.1.10.tar.bz2 -> yast2-country-3.1.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-3.1.10/keyboard/src/modules/Keyboard.rb
new/yast2-country-3.1.11/keyboard/src/modules/Keyboard.rb
--- old/yast2-country-3.1.10/keyboard/src/modules/Keyboard.rb 2014-08-12
13:35:11.000000000 +0200
+++ new/yast2-country-3.1.11/keyboard/src/modules/Keyboard.rb 2014-08-21
16:40:17.000000000 +0200
@@ -880,9 +880,25 @@
)
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
+ # Write systemd settings for X11
+ if x11_setup_needed
+ # According to localectl syntax, if one option is empty then skip
+ # the following ones
+ args = [@XkbLayout, @XkbModel, @XkbVariant, @XkbOptions]
+ blank = args.find_index("")
+ args = args[0, blank] if blank
+ if !args.empty?
+ cmd = "/usr/bin/localectl --no-convert set-x11-keymap #{args.join('
')}"
+ if SCR.Execute(path(".target.bash"), cmd) != 0
+ log.error "X11 configuration not written. Failed to execute
'#{cmd}'"
+ end
+ end
+ end
+
# As a preliminary step mark all keyboards except the one to be
configured
# as configured = no and needed = no. Afterwards this one keyboard will
be
# marked as configured = yes and needed = yes. This has to be done to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.10/keyboard/test/SCRStub.rb
new/yast2-country-3.1.11/keyboard/test/SCRStub.rb
--- old/yast2-country-3.1.10/keyboard/test/SCRStub.rb 2014-08-12
13:35:11.000000000 +0200
+++ new/yast2-country-3.1.11/keyboard/test/SCRStub.rb 2014-08-21
16:40:17.000000000 +0200
@@ -19,6 +19,7 @@
YCP_PATH = Yast::Path.new(".target.ycp")
SIZE_PATH = Yast::Path.new(".target.size")
BASH_PATH = Yast::Path.new(".target.bash")
+ STRING_PATH = Yast::Path.new(".target.string")
# Ensures that non-stubbed SCR calls still works as expected after including
# the module in the testsuite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.10/keyboard/test/keyboard_test.rb
new/yast2-country-3.1.11/keyboard/test/keyboard_test.rb
--- old/yast2-country-3.1.10/keyboard/test/keyboard_test.rb 2014-08-12
13:35:11.000000000 +0200
+++ new/yast2-country-3.1.11/keyboard/test/keyboard_test.rb 2014-08-21
16:40:17.000000000 +0200
@@ -9,6 +9,7 @@
import "Linuxrc"
import "Path"
import "Encoding"
+ import "AsciiFile"
RSpec.configure do |c|
c.include SCRStub
@@ -29,7 +30,12 @@
describe "#Save" do
before(:each) do
+ stub_presence_of "/usr/sbin/xkbctrl"
+ allow(XVersion).to receive(:binPath).and_return "/usr/bin"
+ # Stub the configuration writing...
stub_scr_write
+ # ...but allow the dump_xkbctrl helper to use SCR.Write
+ allow(SCR).to receive(:Write).with(SCRStub::STRING_PATH, anything,
anything).and_call_original
end
context "during installation" do
@@ -38,17 +44,27 @@
let(:chroot) { "installing" }
it "writes the configuration" do
+ expect_to_execute(/loadkeys es\.map\.gz/)
+ # Called twice, for SetConsole and SetX11
+ expect_to_execute(/xkbctrl es/).twice do |p, cmd|
+ dump_xkbctrl(:spanish, cmd.split("> ")[1])
+ end
+ expect_to_execute(/setxkbmap .*layout es/)
+ expect_to_execute(/localectl --no-convert set-x11-keymap es
microsoftpro basic$/)
+ # SetX11 sets autorepeat during installation
+ expect_to_execute(/xset r on$/)
+ expect(AsciiFile).to receive(:AppendLine).with(anything,
["Keytable:", "es.map.gz"])
+
+ Keyboard.Set("spanish")
Keyboard.Save
- expect(written_value_for(".sysconfig.keyboard.YAST_KEYBOARD")).to
eq("english-us,pc104")
+ 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("us")
+ 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
- stub_scr_write
-
expect(Initrd).to_not receive(:Read)
expect(Initrd).to_not receive(:Update)
expect(Initrd).to_not receive(:Write)
@@ -64,6 +80,12 @@
it "writes the configuration" do
expect_to_execute(/loadkeys ruwin_alt-UTF-8\.map\.gz/)
+ # Called twice, for SetConsole and SetX11
+ expect_to_execute(/xkbctrl ruwin_alt-UTF-8/).twice do |p, cmd|
+ dump_xkbctrl(:russian, cmd.split("> ")[1])
+ end
+ expect_to_execute(/setxkbmap .*layout us,ru/)
+ expect_to_execute(/localectl --no-convert set-x11-keymap us,ru
microsoftpro ,winkeys grp:ctrl_shift_toggle,grp_led:scroll$/)
Keyboard.Set("russian")
Keyboard.Save
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.10/package/yast2-country.changes
new/yast2-country-3.1.11/package/yast2-country.changes
--- old/yast2-country-3.1.10/package/yast2-country.changes 2014-08-12
13:35:11.000000000 +0200
+++ new/yast2-country-3.1.11/package/yast2-country.changes 2014-08-21
16:40:17.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Aug 21 13:45:58 UTC 2014 - an...@suse.com
+
+- Persisted X11 keyboard configuration using localectl (bnc#892303)
+- 3.1.11
+
+-------------------------------------------------------------------
Mon Aug 11 12:36:47 UTC 2014 - an...@suse.com
- Regenerate initrd after configuring keyboard (bnc#888804)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.10/package/yast2-country.spec
new/yast2-country-3.1.11/package/yast2-country.spec
--- old/yast2-country-3.1.10/package/yast2-country.spec 2014-08-12
13:35:11.000000000 +0200
+++ new/yast2-country-3.1.11/package/yast2-country.spec 2014-08-21
16:40:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
