Hello community,
here is the log from the commit of package yast2-tune for openSUSE:Leap:15.2
checked in at 2020-03-26 05:41:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-tune (Old)
and /work/SRC/openSUSE:Leap:15.2/.yast2-tune.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tune"
Thu Mar 26 05:41:00 2020 rev:21 rq:787744 version:4.2.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-tune/yast2-tune.changes 2020-01-15
16:32:29.880886283 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.yast2-tune.new.3160/yast2-tune.changes
2020-03-26 05:41:01.191267616 +0100
@@ -1,0 +2,7 @@
+Mon Feb 24 15:10:14 CET 2020 - sch...@suse.de
+
+- Using SysctlConfig class: Handle sysctl entries in different
+ directories (bsc#1151649).
+- 4.2.3
+
+-------------------------------------------------------------------
Old:
----
yast2-tune-4.2.2.tar.bz2
New:
----
yast2-tune-4.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tune.spec ++++++
--- /var/tmp/diff_new_pack.l7zAJE/_old 2020-03-26 05:41:01.531267792 +0100
+++ /var/tmp/diff_new_pack.l7zAJE/_new 2020-03-26 05:41:01.531267792 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-tune
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-tune
-Version: 4.2.2
+Version: 4.2.3
Release: 0
Summary: YaST2 - Hardware Tuning
License: GPL-2.0-or-later
@@ -27,12 +27,12 @@
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-# CFA::Sysctl
-BuildRequires: yast2 >= 4.2.25
+# CFA::SysctlConfig
+BuildRequires: yast2 >= 4.2.67
BuildRequires: yast2-devtools >= 4.2.2
-# CFA::Sysctl
-Requires: yast2 >= 4.2.25
+# # CFA::SysctlConfig
+Requires: yast2 >= 4.2.67
Requires: yast2-bootloader
Requires: yast2-ruby-bindings >= 1.0.0
++++++ yast2-tune-4.2.2.tar.bz2 -> yast2-tune-4.2.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-4.2.2/package/yast2-tune.changes
new/yast2-tune-4.2.3/package/yast2-tune.changes
--- old/yast2-tune-4.2.2/package/yast2-tune.changes 2019-11-27
11:21:45.000000000 +0100
+++ new/yast2-tune-4.2.3/package/yast2-tune.changes 2020-02-25
09:42:56.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Feb 24 15:10:14 CET 2020 - sch...@suse.de
+
+- Using SysctlConfig class: Handle sysctl entries in different
+ directories (bsc#1151649).
+- 4.2.3
+
+-------------------------------------------------------------------
Tue Nov 26 16:38:08 UTC 2019 - David Diaz <dgonza...@suse.com>
- Abort the execution when the bootloader cannot be read
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-4.2.2/package/yast2-tune.spec
new/yast2-tune-4.2.3/package/yast2-tune.spec
--- old/yast2-tune-4.2.2/package/yast2-tune.spec 2019-11-27
11:21:45.000000000 +0100
+++ new/yast2-tune-4.2.3/package/yast2-tune.spec 2020-02-25
09:42:56.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-tune
-Version: 4.2.2
+Version: 4.2.3
Release: 0
Summary: YaST2 - Hardware Tuning
License: GPL-2.0-or-later
@@ -27,12 +27,12 @@
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-# CFA::Sysctl
-BuildRequires: yast2 >= 4.2.25
+# CFA::SysctlConfig
+BuildRequires: yast2 >= 4.2.67
BuildRequires: yast2-devtools >= 4.2.2
-# CFA::Sysctl
-Requires: yast2 >= 4.2.25
+# # CFA::SysctlConfig
+Requires: yast2 >= 4.2.67
Requires: yast2-bootloader
Requires: yast2-ruby-bindings >= 1.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-4.2.2/src/modules/SystemSettings.rb
new/yast2-tune-4.2.3/src/modules/SystemSettings.rb
--- old/yast2-tune-4.2.2/src/modules/SystemSettings.rb 2019-11-27
11:21:45.000000000 +0100
+++ new/yast2-tune-4.2.3/src/modules/SystemSettings.rb 2020-02-25
09:42:56.000000000 +0100
@@ -10,7 +10,7 @@
# This module manages the System and Kernel settings such as I/O Scheduler
type,
# SysRq Keys...
require "yast"
-require "cfa/sysctl"
+require "cfa/sysctl_config"
module Yast
class SystemSettingsClass < Module
@@ -24,12 +24,12 @@
Yast.import "Mode"
# Internal Data
- @elevator = nil
- @enable_sysrq = nil
- @kernel_sysrq = nil
- @sysctl_file = nil
- @sysctl_sysrq = nil
- @modified = false
+ @elevator = nil
+ @enable_sysrq = nil
+ @kernel_sysrq = nil
+ @sysctl_config = nil
+ @sysctl_sysrq = nil
+ @modified = false
end
# Known values of the 'elevator' variable
@@ -185,7 +185,7 @@
# @return [String] Configuration value; returns an empty string if it's
not set.
def sysctl_sysrq
return @sysctl_sysrq if @sysctl_sysrq
- @sysctl_sysrq = sysctl_file.kernel_sysrq
+ @sysctl_sysrq = sysctl_config.kernel_sysrq
log.info("SysRq enabled: #{@sysctl_sysrq}")
@sysctl_sysrq
end
@@ -329,8 +329,8 @@
end
log.info("Saving ENABLE_SYSRQ: #{enable_sysrq}")
- sysctl_file.kernel_sysrq = enable_sysrq
- sysctl_file.save
+ sysctl_config.kernel_sysrq = enable_sysrq
+ sysctl_config.save unless sysctl_config.conflict?
end
# Write IO Scheduler settings
@@ -351,12 +351,12 @@
#
# @note It memoizes the value until {#main} is called.
#
- # @return [Yast2::CFA::Sysctl]
- def sysctl_file
- return @sysctl_file if @sysctl_file
- @sysctl_file = CFA::Sysctl.new
- @sysctl_file.load
- @sysctl_file
+ # @return [Yast2::CFA::SysctlConfig]
+ def sysctl_config
+ return @sysctl_config if @sysctl_config
+ @sysctl_config = CFA::SysctlConfig.new
+ @sysctl_config.load
+ @sysctl_config
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-tune-4.2.2/test/system_settings_test.rb
new/yast2-tune-4.2.3/test/system_settings_test.rb
--- old/yast2-tune-4.2.2/test/system_settings_test.rb 2019-11-27
11:21:45.000000000 +0100
+++ new/yast2-tune-4.2.3/test/system_settings_test.rb 2020-02-25
09:42:56.000000000 +0100
@@ -10,16 +10,16 @@
subject(:settings) { Yast::SystemSettings }
let(:scheduler) { "cfq" }
- let(:sysctl_file) { CFA::Sysctl.new }
+ let(:sysctl_config) { CFA::SysctlConfig.new }
before do
allow(File).to receive(:exist?).and_return(true)
allow(Yast::Bootloader).to receive(:Read)
allow(Yast::Bootloader).to receive(:kernel_param)
.with(:common, "elevator").and_return(scheduler)
- allow(CFA::Sysctl).to receive(:new).and_return(sysctl_file)
- allow(sysctl_file).to receive(:load)
- allow(sysctl_file).to receive(:save)
+ allow(CFA::SysctlConfig).to receive(:new).and_return(sysctl_config)
+ allow(sysctl_config).to receive(:load)
+ allow(sysctl_config).to receive(:save)
settings.main
end
@@ -35,7 +35,7 @@
let(:mode) { "normal" }
before do
- allow(sysctl_file).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
+ allow(sysctl_config).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
allow(File).to receive(:read).with(KERNEL_SYSRQ_FILE)
.and_return(kernel_sysrq)
allow(Yast::Bootloader).to receive(:kernel_param)
@@ -246,7 +246,7 @@
allow(Yast::Mode).to receive(:mode).and_return(mode)
allow(Yast::Bootloader).to receive(:Write)
allow(Yast::SCR).to receive(:Read).and_call_original
- allow(sysctl_file).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
+ allow(sysctl_config).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
end
context "when system settings has been read" do
@@ -256,7 +256,7 @@
let(:sysctl_sysrq) { "0" }
it "updates sysctl configuration" do
- expect(sysctl_file).to receive(:kernel_sysrq=).with(sysctl_sysrq)
+ expect(sysctl_config).to receive(:kernel_sysrq=).with(sysctl_sysrq)
settings.Write
end
end
@@ -265,7 +265,7 @@
let(:sysctl_sysrq) { "-1" }
it "does not update sysctl configuration" do
- expect(sysctl_file).to_not receive(:kernel_sysrq=)
+ expect(sysctl_config).to_not receive(:kernel_sysrq=)
settings.Write
end
end
@@ -287,7 +287,7 @@
context "when system settings hadn't been read" do
it "does not update sysctl configuration" do
- expect(sysctl_file).to_not receive(:kernel_sysrq=)
+ expect(sysctl_config).to_not receive(:kernel_sysrq=)
settings.Write
end
end
@@ -329,7 +329,7 @@
describe "#SetSysRqKeysEnabled" do
before do
allow(Yast::SCR).to receive(:Read).and_call_original
- allow(sysctl_file).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
+ allow(sysctl_config).to receive(:kernel_sysrq).and_return(sysctl_sysrq)
settings.Read
end
