Merge d4cb485 into cbe978b

yast · Jan 25, 2022 · 0a308f5 · 0a308f5
2 parents cbe978b + d4cb485
commit 0a308f5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 25 14:42:40 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Use Package module instead of PackageSystem (bsc#1194886).
+- 4.4.2
+
 -------------------------------------------------------------------
 Mon Sep  6 09:28:56 UTC 2021 - David Diaz <dgonzalez@suse.com>
 

diff --git a/package/yast2-kdump.spec b/package/yast2-kdump.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        4.4.1
+Version:        4.4.2
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0-only
@@ -30,13 +30,13 @@ BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:yast-rake)
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2
-# Yast::Arch.paravirtualized_xen_guest?
-BuildRequires:  yast2 >= 4.3.45
+# Replace PackageSystem with Package
+BuildRequires:  yast2 >= 4.4.38
 BuildRequires:  yast2-bootloader
 BuildRequires:  yast2-buildtools >= 4.2.2
 
-# Yast::Arch.paravirtualized_xen_guest?
-Requires:       yast2 >= 4.3.45
+# Replace PackageSystem with Package
+Requires:       yast2 >= 4.4.38
 # Kernel parameters with multiple values and bug#945479 fixed
 Requires:       yast2-bootloader >= 3.1.148
 Requires:       yast2-ruby-bindings >= 1.0.0

diff --git a/src/include/kdump/complex.rb b/src/include/kdump/complex.rb
@@ -42,7 +42,7 @@ def initialize_kdump_complex(include_target)
       Yast.import "Report"
       Yast.import "Mode"
       Yast.import "Message"
-      Yast.import "PackageSystem"
+      Yast.import "Package"
 
       Yast.include include_target, "kdump/helps.rb"
     end
@@ -65,7 +65,7 @@ def PollAbort
     def InstallPackages
       # install packages
       package_list = KdumpClass::KDUMP_PACKAGES
-      if !PackageSystem.CheckAndInstallPackages(package_list)
+      if !Package.CheckAndInstallPackages(package_list)
         Report.Error(Message.CannotContinueWithoutPackagesInstalled)
         Builtins.y2error(
           "[kdump] Installation of package list %1 failed or aborted",

diff --git a/src/include/kdump/uifunctions.rb b/src/include/kdump/uifunctions.rb
@@ -36,7 +36,7 @@ def initialize_kdump_uifunctions(_include_target)
       Yast.import "Kdump"
       Yast.import "Service"
       Yast.import "Package"
-      Yast.import "PackageSystem"
+      Yast.import "Package"
       Yast.import "Mode"
 
       # EXAMPLE FUNCTIONS
@@ -687,7 +687,7 @@ def ValidTargetKdump(_key, _event)
             "SMB/CIFS share cannot be mounted, installing missing 'cifs-mount' package..."
           )
           # install cifs-mount package
-          PackageSystem.CheckAndInstallPackages(["cifs-mount"])
+          Package.CheckAndInstallPackages(["cifs-mount"])
         end
 
         value = Builtins.tostring(UI.QueryWidget(Id("server"), :Value))
@@ -1235,7 +1235,7 @@ def ValidDumpLevel(_key, _event)
           package_list = []
           package_list = Builtins.add(package_list, "makedumpfile")
 
-          if !PackageSystem.CheckAndInstallPackages(package_list)
+          if !Package.CheckAndInstallPackages(package_list)
             result = false
 
             if !Mode.commandline
@@ -1512,7 +1512,7 @@ def ValidDumpFormat(_key, _event)
           package_list = []
           package_list = Builtins.add(package_list, "makedumpfile")
 
-          if !PackageSystem.CheckAndInstallPackages(package_list)
+          if !Package.CheckAndInstallPackages(package_list)
             result = false
 
             if !Mode.commandline