commit yast2-country for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2017-11-04 10:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Sat Nov 4 10:22:25 2017 rev:187 rq:537932 version:4.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2017-10-28 14:19:36.876092415 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2017-11-04 10:22:26.613830017 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 14:41:28 UTC 2017 - lslezak@suse.cz + +- Let the "localectl" tool to create the X11 keyboard configuration + (bsc#1065264) +- 4.0.6 + +------------------------------------------------------------------- Old: ---- yast2-country-4.0.5.tar.bz2 New: ---- yast2-country-4.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.wjGzFA/_old 2017-11-04 10:22:27.605793957 +0100 +++ /var/tmp/diff_new_pack.wjGzFA/_new 2017-11-04 10:22:27.609793811 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.5 +Version: 4.0.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-4.0.5.tar.bz2 -> yast2-country-4.0.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.5/keyboard/src/modules/Keyboard.rb new/yast2-country-4.0.6/keyboard/src/modules/Keyboard.rb --- old/yast2-country-4.0.5/keyboard/src/modules/Keyboard.rb 2017-10-25 11:10:59.357922312 +0200 +++ new/yast2-country-4.0.6/keyboard/src/modules/Keyboard.rb 2017-10-31 16:16:49.235902919 +0100 @@ -890,20 +890,18 @@ # do not use --root option, SCR.Execute(".target...") already runs in chroot "/usr/bin/systemd-firstboot --keymap '#{chomped_keymap}'" else - "/usr/bin/localectl --no-convert set-keymap #{chomped_keymap}" + # this sets both the console and the X11 keyboard (see "man localectl") + "/usr/bin/localectl set-keymap #{chomped_keymap}" end - log.info "Making console keyboard persistent: #{cmd}" + log.info "Making keyboard setting persistent: #{cmd}" result = SCR.Execute(path(".target.bash_output"), cmd) if result["exit"] != 0 # TRANSLATORS: the "%s" is replaced by the executed command Report.Error(_("Could not save the keyboard setting, the command\n%s\nfailed.") % cmd) - log.error "Console keyboard configuration not written. Failed to execute '#{cmd}'" + log.error "Keyboard configuration not written. Failed to execute '#{cmd}'" log.error "output: #{result.inspect}" end - # Write systemd settings for X11 - call_set_x11_keymap if x11_setup_needed - # 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 @@ -1553,30 +1551,6 @@ # eval is necessary for translating the texts needed to be translated content ? Builtins.eval(content) : {} end - - def call_set_x11_keymap - if Stage.initial - # see https://bugzilla.opensuse.org/show_bug.cgi?id=1046436#c57 for reasoning - log.info "Skipping setting of x11 keymap in installation" - return - end - - args = [@XkbLayout, @XkbModel, @XkbVariant, @XkbOptions] - return if args.all?(&:empty?) - - # The localectl syntax enforces a fixed order for the X11 options. - # Empty options at the end of the command can (must) be skipped. - # Other empty options must be specified as "". - last_idx = args.rindex { |a| !a.empty? } - args = args[0..last_idx] - args.map! { |a| a.empty? ? "\"\"" : a } - - cmd = "/usr/bin/localectl --no-convert set-x11-keymap #{args.join(' ')}" - log.info "Making X11 keyboard persistent: #{cmd}" - if SCR.Execute(path(".target.bash"), cmd) != 0 - log.error "X11 configuration not written. Failed to execute '#{cmd}'" - end - end end Keyboard = KeyboardClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.5/keyboard/test/keyboard_test.rb new/yast2-country-4.0.6/keyboard/test/keyboard_test.rb --- old/yast2-country-4.0.5/keyboard/test/keyboard_test.rb 2017-10-25 11:10:59.357922312 +0200 +++ new/yast2-country-4.0.6/keyboard/test/keyboard_test.rb 2017-10-31 16:16:49.239902919 +0100 @@ -100,11 +100,8 @@ let(:new_lang) { "russian" } it "writes the configuration" do - 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_output( - /localectl --no-convert set-keymap ruwin_alt-UTF-8$/ + /localectl set-keymap ruwin_alt-UTF-8$/ ) Keyboard.Set("russian") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.5/package/yast2-country.changes new/yast2-country-4.0.6/package/yast2-country.changes --- old/yast2-country-4.0.5/package/yast2-country.changes 2017-10-25 11:10:59.369922312 +0200 +++ new/yast2-country-4.0.6/package/yast2-country.changes 2017-10-31 16:16:49.247902919 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 31 14:41:28 UTC 2017 - lslezak@suse.cz + +- Let the "localectl" tool to create the X11 keyboard configuration + (bsc#1065264) +- 4.0.6 + +------------------------------------------------------------------- Wed Oct 25 08:43:25 UTC 2017 - lslezak@suse.cz - Display an error popup when saving the keyboard config fails diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.5/package/yast2-country.spec new/yast2-country-4.0.6/package/yast2-country.spec --- old/yast2-country-4.0.5/package/yast2-country.spec 2017-10-25 11:10:59.369922312 +0200 +++ new/yast2-country-4.0.6/package/yast2-country.spec 2017-10-31 16:16:49.247902919 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.5 +Version: 4.0.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build
participants (1)
-
root@hilbert.suse.de