Hello community,

here is the log from the commit of package yast2-tune for openSUSE:Factory 
checked in at 2020-04-11 23:45:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-tune (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-tune.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-tune"

Sat Apr 11 23:45:24 2020 rev:67 rq:791961 version:4.2.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-tune/yast2-tune.changes    2019-12-14 
12:02:37.847410341 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-tune.new.3248/yast2-tune.changes  
2020-04-11 23:45:26.807039539 +0200
@@ -1,0 +2,7 @@
+Mon Feb 24 15:10:14 CET 2020 - [email protected]
+
+- 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.4lT8tM/_old  2020-04-11 23:45:27.383039952 +0200
+++ /var/tmp/diff_new_pack.4lT8tM/_new  2020-04-11 23:45:27.387039955 +0200
@@ -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/CONTRIBUTING.md 
new/yast2-tune-4.2.3/CONTRIBUTING.md
--- old/yast2-tune-4.2.2/CONTRIBUTING.md        2019-11-27 11:21:45.000000000 
+0100
+++ new/yast2-tune-4.2.3/CONTRIBUTING.md        1970-01-01 01:00:00.000000000 
+0100
@@ -1,89 +0,0 @@
-YaST Contribution Guidelines
-============================
-
-YaST is an open source project and as such it welcomes all kinds of
-contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and the YaST 
maintainers.
-
-There are two main forms of contribution: reporting bugs and performing code
-changes.
-
-Bug Reports
------------
-
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
-or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
-registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
-if you don't have an account yet.)
-
-When creating a bug report, please follow our [bug reporting
-guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
-
-We can't guarantee that every bug will be fixed, but we'll try.
-
-Code Changes
-------------
-
-We welcome all kinds of code contributions, from simple bug fixes to 
significant
-refactorings and implementation of new features. However, before making any
-non-trivial contribution, get in touch with us first — this can prevent wasted
-effort on both sides. Also, have a look at our [development
-documentation](http://en.opensuse.org/openSUSE:YaST_development).
-
-To send us your code change, use GitHub pull requests. The workflow is as
-follows:
-
-  1. Fork the project.
-
-  2. Create a topic branch based on `master`.
-
-  3. Implement your change, including tests (if possible). Make sure you adhere
-     to the [Ruby style
-     guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
-
-  4. Update the package version (in `packages/*.spec`, usually by
-     `rake version:bump`) and add a new entry to the `package/*.changes` file
-     (by `osc vc package`).  
-     For bigger changes or changes which need longer discussion it is advised 
to
-     add this as a separate last commit so it can be easily updated when 
another
-     change is merged in the meantime.
-
-  5. Make sure your change didn't break anything by building the RPM package
-     (`rake osc:build`). The build process includes running the full testsuite.
-
-  6. Publish the branch and create a pull request.
-
-  7. YaST developers will review your change and possibly point out issues.
-     Adapt the code under their guidance until they are all resolved.
-
-  8. Finally, the pull request will get merged or rejected.
-
-See also [GitHub's guide on
-contributing](https://help.github.com/articles/fork-a-repo).
-
-If you want to do multiple unrelated changes, use separate branches and pull
-requests.
-
-### Commits
-
-Each commit in the pull request should do only one thing, which is clearly
-described by its commit message. Especially avoid mixing formatting changes and
-functional changes into one commit. When writing commit messages, adhere to
-[widely used
-conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-
-If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
-you mention it in the commit message for cross-reference. Use format like
-bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
-autolinking](https://help.github.com/articles/github-flavored-markdown#references)
-and [openSUSE abbreviation
-reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
-
-Additional Information
-----------------------
-
-If you have any question, feel free to ask at the [development mailing
-list](http://lists.opensuse.org/yast-devel/) or at the
-[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
-We'll do our best to provide a timely and accurate answer.
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-04-07 
12:54:05.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Feb 24 15:10:14 CET 2020 - [email protected]
+
+- Using SysctlConfig class: Handle sysctl entries in different
+  directories (bsc#1151649).
+- 4.2.3
+
+-------------------------------------------------------------------
 Tue Nov 26 16:38:08 UTC 2019 - David Diaz <[email protected]>
 
 - 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-04-07 
12:54:05.000000000 +0200
@@ -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-04-07 
12:54:05.000000000 +0200
@@ -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-04-07 
12:54:05.000000000 +0200
@@ -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
 


Reply via email to