diff --git a/package/autoyast2.changes b/package/autoyast2.changes index 91e489801..a530f8288 100644 --- a/package/autoyast2.changes +++ b/package/autoyast2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 3 11:48:36 UTC 2022 - Imobach Gonzalez Sosa + +- Consider user selected packages as optional to not block the + installation (bsc#1195747). +- 4.4.33 + ------------------------------------------------------------------- Mon Feb 28 10:39:35 UTC 2022 - Steffen Winterfeldt diff --git a/package/autoyast2.spec b/package/autoyast2.spec index 24ca34f2e..b5dad0f18 100644 --- a/package/autoyast2.spec +++ b/package/autoyast2.spec @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.4.32 +Version: 4.4.33 Release: 0 Summary: YaST2 - Automated Installation License: GPL-2.0-only diff --git a/src/modules/AutoinstSoftware.rb b/src/modules/AutoinstSoftware.rb index de011d340..9049b3be3 100644 --- a/src/modules/AutoinstSoftware.rb +++ b/src/modules/AutoinstSoftware.rb @@ -152,7 +152,9 @@ def Import(settings) ) to_install = settings.fetch("packages", []) - PackagesProposal.AddResolvables("autoyast", :package, to_install) unless to_install.empty? + unless to_install.empty? + PackagesProposal.AddResolvables("autoyast", :package, to_install, optional: true) + end @kernel = settings.fetch("kernel", "") addPostPackages(settings.fetch("post-packages", [])) @@ -168,7 +170,9 @@ def Import(settings) # @param pkglist [Array] list of additional packages to be installed def add_additional_packages(pkglist) available = pkglist & @packagesAvailable - PackagesProposal.AddResolvables("autoyast", :package, available) unless available.empty? + return if available.empty? + + PackagesProposal.AddResolvables("autoyast", :package, available, optional: true) end def AddYdepsFromProfile(entries) @@ -207,7 +211,7 @@ def Export s["kernel"] = @kernel if !@kernel.empty? s["patterns"] = @patterns if !@patterns.empty? - pkgs_to_install = Yast::PackagesProposal.GetResolvables("autoyast", :package) + pkgs_to_install = Yast::PackagesProposal.GetResolvables("autoyast", :package, optional: true) s["packages"] = pkgs_to_install unless pkgs_to_install.empty? pkg_post = AutoinstData.post_packages diff --git a/test/AutoinstSoftware_test.rb b/test/AutoinstSoftware_test.rb index 7f53ca324..bc79f1e60 100755 --- a/test/AutoinstSoftware_test.rb +++ b/test/AutoinstSoftware_test.rb @@ -43,7 +43,7 @@ it "appends the given list to the one to be installed" do Yast::AutoinstSoftware.add_additional_packages(pkgs) - expect(Yast::PackagesProposal.GetResolvables("autoyast", :package)) + expect(Yast::PackagesProposal.GetResolvables("autoyast", :package, optional: true)) .to include("NetworkManager") end @@ -52,7 +52,7 @@ it "the packages are not added" do Yast::AutoinstSoftware.add_additional_packages(pkgs) - expect(Yast::PackagesProposal.GetResolvables("NetworkManager", :package)) + expect(Yast::PackagesProposal.GetResolvables("NetworkManager", :package, optional: true)) .to_not include("NetworkManager") end end @@ -79,7 +79,8 @@ it "saves the list of patterns and packages to install and remove" do subject.Import(software) expect(subject.patterns).to eq(["base", "yast2_basis"]) - expect(Yast::PackagesProposal.GetResolvables("autoyast", :package)).to eq(["yast2", "other"]) + expect(Yast::PackagesProposal.GetResolvables("autoyast", :package, optional: true)) + .to eq(["yast2", "other"]) expect(Yast::PackagesProposal.GetTaboos("autoyast", :package)).to eq(["dummy"]) end