Hello community,

here is the log from the commit of package yast2-kdump for openSUSE:Factory 
checked in at 2017-12-19 10:48:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-kdump (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-kdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-kdump"

Tue Dec 19 10:48:02 2017 rev:87 rq:557322 version:4.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-kdump/yast2-kdump.changes  2017-08-13 
14:55:03.127631234 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-kdump.new/yast2-kdump.changes     
2017-12-19 10:48:05.063482434 +0100
@@ -1,0 +2,7 @@
+Fri Dec 15 11:34:57 UTC 2017 - [email protected]
+
+- Show kdump as disabled in an installation proposal if the product
+  disables it (bsc#1071242)
+- 4.0.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-kdump-3.3.2.tar.bz2

New:
----
  yast2-kdump-4.0.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-kdump.spec ++++++
--- /var/tmp/diff_new_pack.xkadXd/_old  2017-12-19 10:48:06.143430301 +0100
+++ /var/tmp/diff_new_pack.xkadXd/_new  2017-12-19 10:48:06.147430108 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.3.2
+Version:        4.0.0
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0

++++++ yast2-kdump-3.3.2.tar.bz2 -> yast2-kdump-4.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-kdump-3.3.2/package/yast2-kdump.changes 
new/yast2-kdump-4.0.0/package/yast2-kdump.changes
--- old/yast2-kdump-3.3.2/package/yast2-kdump.changes   2017-08-11 
04:44:13.022521757 +0200
+++ new/yast2-kdump-4.0.0/package/yast2-kdump.changes   2017-12-15 
13:49:58.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Dec 15 11:34:57 UTC 2017 - [email protected]
+
+- Show kdump as disabled in an installation proposal if the product
+  disables it (bsc#1071242)
+- 4.0.0
+
+-------------------------------------------------------------------
 Thu Aug 10 09:06:45 UTC 2017 - [email protected]
 
 - Removed leftover dependency on yast2-storage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-kdump-3.3.2/package/yast2-kdump.spec 
new/yast2-kdump-4.0.0/package/yast2-kdump.spec
--- old/yast2-kdump-3.3.2/package/yast2-kdump.spec      2017-08-11 
04:44:13.022521757 +0200
+++ new/yast2-kdump-4.0.0/package/yast2-kdump.spec      2017-12-15 
13:49:58.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.3.2
+Version:        4.0.0
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-kdump-3.3.2/src/modules/Kdump.rb 
new/yast2-kdump-4.0.0/src/modules/Kdump.rb
--- old/yast2-kdump-3.3.2/src/modules/Kdump.rb  2017-08-11 04:44:13.106521757 
+0200
+++ new/yast2-kdump-4.0.0/src/modules/Kdump.rb  2017-12-15 13:49:58.000000000 
+0100
@@ -621,17 +621,6 @@
 
       #number of stages
       steps = 2
-      if Mode.installation
-        write_kdump = ProductFeatures.GetBooleanFeature(
-          "globals",
-          "enable_kdump"
-        )
-        if write_kdump == nil || !write_kdump
-          Builtins.y2milestone("Installation doesn't support kdump.")
-          return true
-        end
-      end
-
       if (Mode.installation || Mode.autoinst) && !@add_crashkernel_param
         Builtins.y2milestone(
           "Skip writing of configuration for kdump during installation"
@@ -700,8 +689,12 @@
     # @return [Boolean] the default proposed state
 
     def ProposeCrashkernelParam
+      # proposing disabled kdump if product wants it (bsc#1071242)
+      if !ProductFeatures.GetBooleanFeature("globals", "enable_kdump")
+        log.info "Kdump disabled in control file"
+        false
       # proposing disabled kdump if PC has less than 1024MB RAM
-      if total_memory < 1024
+      elsif total_memory < 1024
         log.info "not enough memory - kdump proposed as disabled"
         false
       # proposing disabled kdump on aarch64 (bsc#989321) - kdump not 
implemented
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-kdump-3.3.2/test/kdump_test.rb 
new/yast2-kdump-4.0.0/test/kdump_test.rb
--- old/yast2-kdump-3.3.2/test/kdump_test.rb    2017-08-11 04:44:13.110521757 
+0200
+++ new/yast2-kdump-4.0.0/test/kdump_test.rb    2017-12-15 13:49:58.000000000 
+0100
@@ -50,6 +50,8 @@
     before do
       allow(Yast::Kdump).to receive(:total_memory).and_return 1024
       allow(Yast::Arch).to receive(:aarch64).and_return false
+      allow(Yast::ProductFeatures).to 
receive(:GetBooleanFeature).with("globals", "enable_kdump")
+        .and_return(true)
     end
 
     context "while running on machine with less than 1024 MB memory" do
@@ -66,6 +68,15 @@
 
         expect(Yast::Kdump.ProposeCrashkernelParam).to eq false
       end
+    end
+
+    context "while product disabled kdump" do
+      it "proposes kdump to be disabled" do
+        allow(Yast::ProductFeatures).to 
receive(:GetBooleanFeature).with("globals", "enable_kdump")
+          .and_return(false)
+
+        expect(Yast::Kdump.ProposeCrashkernelParam).to eq false
+      end
     end
 
     context "otherwise" do


Reply via email to