Merge pull request #114 from yast/huha-plugins

add_on: Check for -pkg UI Plug-In and Prompt to Install it if Needed
yast · Sep 20, 2021 · 2c7838c · 2c7838c
2 parents 3d2c14c + 156e0e3
commit 2c7838c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 15 13:56:13 UTC 2021 - Stefan Hundhammer <shundhammer@suse.com>
+
+- When the user clicks on "Run Software Manager", check for the
+  "pkg" UI extension and prompt user to install it if not present
+  (jsc#SLE-20346, jsc#SLE-20462)
+- 4.4.3
+
 -------------------------------------------------------------------
 Tue Aug 31 11:15:52 UTC 2021 - David Diaz <dgonzalez@suse.com>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.4.2
+Version:        4.4.3
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only
@@ -29,14 +29,15 @@ Source0:        %{name}-%{version}.tar.bz2
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:yast-rake)
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
 BuildRequires:  update-desktop-files
-BuildRequires:  yast2 >= 3.0.1
+# UIExtensionChecker
+BuildRequires:  yast2 >= 4.4.19
 BuildRequires:  yast2-devtools >= 3.1.10
 # Y2packager::Resolvables
 BuildRequires:  yast2-packager >= 4.2.11
 
 Requires:       autoyast2-installation
-# ProductProfile
-Requires:       yast2 >= 3.0.1
+# UIExtensionChecker
+Requires:       yast2 >= 4.4.19
 Requires:       yast2-country
 Requires:       yast2-installation
 # Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -15,6 +15,7 @@
 
 require "y2packager/medium_type"
 require "y2packager/resolvable"
+require "ui/ui_extension_checker"
 
 module Yast
   module AddOnAddOnWorkflowInclude
@@ -1788,11 +1789,15 @@ def RunAddOnsOverviewDialog
 
           # Calling packager directly
         when :packager
-          Builtins.y2milestone("Calling packager...")
-          RunPackageSelector()
+          ui_extension_checker = UIExtensionChecker.new("pkg")
 
-          CreateAddOnsOverviewDialog()
-          RedrawAddOnsOverviewTable()
+          if ui_extension_checker.ok?
+            Builtins.y2milestone("Calling packager...")
+            RunPackageSelector()
+
+            CreateAddOnsOverviewDialog()
+            RedrawAddOnsOverviewTable()
+          end
 
           # Everything else
         else