From 9d6f05bbd5d6a96e5d17e3e911d22e53e52dbac4 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Tue, 14 Sep 2021 17:41:35 +0200 Subject: [PATCH 1/4] Use new class to check for the pkg UI extension --- src/clients/sw_single.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/clients/sw_single.rb b/src/clients/sw_single.rb index f2c0d4913..13d08aa9e 100644 --- a/src/clients/sw_single.rb +++ b/src/clients/sw_single.rb @@ -8,6 +8,7 @@ require "y2packager/known_repositories" require "y2packager/system_packages" require "y2packager/resolvable" +require "ui/ui_extension_checker" module Yast # Purpose: contains dialog loop for workflows: @@ -73,6 +74,9 @@ def main return CommandLine.Run(@cmdline_description) end + ui_extension_checker = UIExtensionChecker.new("pkg") + return unless ui_extension_checker.ok? + StartSWSingle() end From 216a38e1633ad949b97990a002f59e4f4d70a6bf Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 14:37:08 +0200 Subject: [PATCH 2/4] Version bump and change log --- package/yast2-packager.changes | 8 ++++++++ package/yast2-packager.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes index 275922007..a96a75822 100644 --- a/package/yast2-packager.changes +++ b/package/yast2-packager.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 15 12:35:42 UTC 2021 - Stefan Hundhammer + +- Check if the "pkg" UI plug-in is available and if not, ask + the user if it should be installed + (jsc#SLE-20346, jsc#SLE-20462) +- 4.4.10 + ------------------------------------------------------------------- Mon Aug 23 13:31:34 UTC 2021 - Ladislav Slezák diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec index 49bf34186..50cb1e36f 100644 --- a/package/yast2-packager.spec +++ b/package/yast2-packager.spec @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.4.9 +Version: 4.4.10 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later From edc190c23a8d822312f1e98a57e9ce9e8308e30a Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 14:51:04 +0200 Subject: [PATCH 3/4] Require yast2 package with UIExtensionChecker --- package/yast2-packager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec index 50cb1e36f..28d7d1a16 100644 --- a/package/yast2-packager.spec +++ b/package/yast2-packager.spec @@ -48,8 +48,8 @@ BuildRequires: ruby-solv Requires: yast2-country-data >= 2.16.3 # raw_name Requires: yast2-pkg-bindings >= 4.2.8 -# Installation::InstallationInfo -Requires: yast2 >= 4.4.4 +# UIExtensionChecker +Requires: yast2 >= 4.4.18 # unzipping license file Requires: unzip # HTTP, FTP, HTTPS modules (inst_productsources.ycp) From 459e819f3a3753f171ebcc67387975d397054689 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Wed, 15 Sep 2021 17:32:12 +0200 Subject: [PATCH 4/4] Fixed version number after yet another merge conflict and version bump --- package/yast2-packager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec index 28d7d1a16..3679875da 100644 --- a/package/yast2-packager.spec +++ b/package/yast2-packager.spec @@ -49,7 +49,7 @@ Requires: yast2-country-data >= 2.16.3 # raw_name Requires: yast2-pkg-bindings >= 4.2.8 # UIExtensionChecker -Requires: yast2 >= 4.4.18 +Requires: yast2 >= 4.4.19 # unzipping license file Requires: unzip # HTTP, FTP, HTTPS modules (inst_productsources.ycp)