commit yast2-kdump for openSUSE:Factory

2 Jul 2014

Hello community,

here is the log from the commit of package yast2-kdump for openSUSE:Factory checked in at 2014-07-02 15:04:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-kdump (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-kdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-kdump"

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-kdump/yast2-kdump.changes	2014-06-19 13:08:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-kdump.new/yast2-kdump.changes	2014-07-02 15:04:04.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jun 30 11:38:01 UTC 2014 - mvidner@suse.cz
+
+- Use kdump.rpm also on ppc64; kernel-kdump.rpm is gone
+  (bnc#882062).
+- 3.1.16
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-kdump.spec ++++++
--- /var/tmp/diff_new_pack.FHrQBa/_old	2014-07-02 15:04:05.000000000 +0200
+++ /var/tmp/diff_new_pack.FHrQBa/_new	2014-07-02 15:04:05.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.1.15
+Version:        3.1.16
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0

++++++ yast2-kdump-3.1.15.tar.bz2 -> yast2-kdump-3.1.16.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.15/package/yast2-kdump.changes new/yast2-kdump-3.1.16/package/yast2-kdump.changes
--- old/yast2-kdump-3.1.15/package/yast2-kdump.changes	2014-06-16 15:10:49.000000000 +0200
+++ new/yast2-kdump-3.1.16/package/yast2-kdump.changes	2014-07-01 08:09:12.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Jun 30 11:38:01 UTC 2014 - mvidner@suse.cz
+
+- Use kdump.rpm also on ppc64; kernel-kdump.rpm is gone
+  (bnc#882062).
+- 3.1.16
+
+-------------------------------------------------------------------
 Mon Jun 16 14:27:19 CEST 2014 - snwint@suse.de
 
 - change kdump default settings to: level = 31, format = lzo (bnc #875939)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.15/package/yast2-kdump.spec new/yast2-kdump-3.1.16/package/yast2-kdump.spec
--- old/yast2-kdump-3.1.15/package/yast2-kdump.spec	2014-06-16 15:10:49.000000000 +0200
+++ new/yast2-kdump-3.1.16/package/yast2-kdump.spec	2014-07-01 08:09:12.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.1.15
+Version:        3.1.16
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.15/src/include/kdump/complex.rb new/yast2-kdump-3.1.16/src/include/kdump/complex.rb
--- old/yast2-kdump-3.1.15/src/include/kdump/complex.rb	2014-06-16 15:10:49.000000000 +0200
+++ new/yast2-kdump-3.1.16/src/include/kdump/complex.rb	2014-07-01 08:09:12.000000000 +0200
@@ -39,7 +39,7 @@
       Yast.import "Kdump"
       Yast.import "Package"
       Yast.import "Arch"
-      Yast.import "CommandLine"
+      Yast.import "Report"
       Yast.import "Mode"
       Yast.import "Message"
       Yast.import "PackageSystem"
@@ -61,89 +61,29 @@
       UI.PollInput == :abort
     end
 
-    # Read settings dialog
-    # @return `abort if aborted and `next otherwise
-    def ReadDialog
-      kexec_installed = false
-      kdump_installed = false
-      kexec_available = false
-      kdump_available = false
-      package_list = []
-
-      Wizard.RestoreHelp(Ops.get_string(@HELPS, "read", ""))
-      # Kdump::AbortFunction = PollAbort;
-      return :abort if !Confirm.MustBeRoot
-
-      # checking of installation packages
-      kexec_installed = true if Package.Installed("kexec-tools")
-
-      kdump = ""
-
-      # only ppc64 includes package kernel-kdump
-      # others include kdump and kexec-tools depend on it
-
-      if Arch.ppc64
-        kdump = "kernel-kdump"
-      else
-        kdump = "kdump"
-      end
-
-      kdump_installed = true if Package.Installed(kdump)
-
-      #checking if packages are available
-      if !kexec_installed || !kdump_installed
-        kexec_available = Package.Available("kexec-tools") if !kexec_installed
-
-        kdump_available = Package.Available(kdump) if !kdump_installed
-
-        if !kexec_installed && !kexec_available
-          if !Mode.commandline
-            Popup.Error(_("Package for kexec-tools is not available."))
-          else
-            CommandLine.Error(_("Package for kexec-tools is not available."))
-          end
-          Builtins.y2error(
-            "[kdump] (ReadDialog ()) Packages for kexec-tools is not available."
-          )
-          return :abort
-        end
-
-        if !kdump_installed && !kdump_available
-          if !Mode.commandline
-            Popup.Error(_("Package for kdump is not available."))
-          else
-            CommandLine.Error(_("Package for kdump is not available."))
-          end
-          Builtins.y2error(
-            "[kdump] (ReadDialog ()) Packages for %1 is not available.",
-            kdump
-          )
-          return :abort
-        end
-
-        #add packages for installation
-        if !kexec_installed
-          package_list = Builtins.add(package_list, "kexec-tools")
-        end
-
-        package_list = Builtins.add(package_list, kdump) if !kdump_installed
-
-        #install packages
-        if !PackageSystem.CheckAndInstallPackages(package_list)
-          if !Mode.commandline
-            Popup.Error(Message.CannotContinueWithoutPackagesInstalled)
-          else
-            CommandLine.Error(Message.CannotContinueWithoutPackagesInstalled)
-          end
-          Builtins.y2error(
+    # @return true if necessary packages are installed
+    def InstallPackages
+      #install packages
+      package_list = KdumpClass::KDUMP_PACKAGES
+      if !PackageSystem.CheckAndInstallPackages(package_list)
+        Report.Error(Message.CannotContinueWithoutPackagesInstalled)
+        Builtins.y2error(
             "[kdump] Installation of package list %1 failed or aborted",
             package_list
           )
-          return :abort
-        end
+        return false
       end
 
+      true
+    end
 
+    # Read settings dialog
+    # @return `abort if aborted and `next otherwise
+    def ReadDialog
+      Wizard.RestoreHelp(Ops.get_string(@HELPS, "read", ""))
+      # Kdump::AbortFunction = PollAbort;
+      return :abort if !Confirm.MustBeRoot
+      InstallPackages() or return :abort
 
       ret = Kdump.Read
       ret ? :next : :abort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.15/src/modules/Kdump.rb new/yast2-kdump-3.1.16/src/modules/Kdump.rb
--- old/yast2-kdump-3.1.15/src/modules/Kdump.rb	2014-06-16 15:10:49.000000000 +0200
+++ new/yast2-kdump-3.1.16/src/modules/Kdump.rb	2014-07-01 08:09:12.000000000 +0200
@@ -36,6 +36,7 @@
 
     FADUMP_KEY = "KDUMP_FADUMP"
     KDUMP_SERVICE_NAME = "kdump"
+    KDUMP_PACKAGES = ["kexec-tools", "kdump"]
 
     def main
       textdomain "kdump"
@@ -520,7 +521,7 @@
     end
 
     # Write kdump boot argument crashkernel
-    # set kernel-kdump start at boot
+    # set kdump start at boot
     #
     #  @return [Boolean] successfull
     def WriteKdumpBootParameter
@@ -562,7 +563,7 @@
           return result
         end
 
-        # start kernel-kdump at boot
+        # start kdump at boot
         Service.Enable(KDUMP_SERVICE_NAME)
 
         Service.Restart(KDUMP_SERVICE_NAME) if Service.Status(KDUMP_SERVICE_NAME) == 0
@@ -739,8 +740,7 @@
     def AddPackages
       return unless Mode.installation
 
-      @kdump_packages << "kexec-tools"
-      @kdump_packages << (Arch.ppc64 ? "kernel-kdump" : "kdump")
+      @kdump_packages.concat KDUMP_PACKAGES
     end
 
     # Propose global variables once...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)