From 0a89bde50abaf921bebbb09c32f002954801017d Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 15:55:23 +0200 Subject: [PATCH 1/4] Check for pkg UI extension upon click on SW mgr button --- src/include/add-on/add-on-workflow.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index c24edf0..cd05f8f 100755 --- 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 From 6c0df5280ecb7838f31ea71974bb30a6a625bbfe Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 15:57:26 +0200 Subject: [PATCH 2/4] Version bump and change log --- package/yast2-add-on.changes | 8 ++++++++ package/yast2-add-on.spec | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes index a05bf16..6430531 100644 --- 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 + +- 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 diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec index acc12f4..f2f3755 100644 --- 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 @@ -35,8 +35,8 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-packager >= 4.2.11 Requires: autoyast2-installation -# ProductProfile -Requires: yast2 >= 3.0.1 +# UIExtensionChecker +Requires: yast2 >= 4.4.18 Requires: yast2-country Requires: yast2-installation # Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action From 6ae4d59aac8eb1ecf484be802a61932032e4ef83 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 16:06:36 +0200 Subject: [PATCH 3/4] Also build-require the new yast2 pkg --- package/yast2-add-on.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec index f2f3755..f6980de 100644 --- a/package/yast2-add-on.spec +++ b/package/yast2-add-on.spec @@ -29,7 +29,8 @@ 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.18 BuildRequires: yast2-devtools >= 3.1.10 # Y2packager::Resolvables BuildRequires: yast2-packager >= 4.2.11 From 156e0e33fff489f81eb8a1602c84f09a0e58109a Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 17:31:35 +0200 Subject: [PATCH 4/4] Fixed version number after yet another merge conflict and version bump --- package/yast2-add-on.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec index f6980de..efd1ecd 100644 --- a/package/yast2-add-on.spec +++ b/package/yast2-add-on.spec @@ -30,14 +30,14 @@ BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: update-desktop-files # UIExtensionChecker -BuildRequires: yast2 >= 4.4.18 +BuildRequires: yast2 >= 4.4.19 BuildRequires: yast2-devtools >= 3.1.10 # Y2packager::Resolvables BuildRequires: yast2-packager >= 4.2.11 Requires: autoyast2-installation # UIExtensionChecker -Requires: yast2 >= 4.4.18 +Requires: yast2 >= 4.4.19 Requires: yast2-country Requires: yast2-installation # Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action