Merge pull request #833 from yast/merge-sle-15-sp3

bsc#1196566: properly handle the dopackages option (master)

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  7 11:00:12 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Properly handle the "dopackages" option in the openFile
+  method of the AyastSetup module (bsc#1196566).
+- 4.4.35
+
 -------------------------------------------------------------------
 Tue Mar  4 13:14:15 UTC 2022 - José Iván López González <jlopez@suse.com>
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.4.34
+Version:        4.4.35
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

src/clients/ayast_setup.rb

@@ -34,7 +34,6 @@ def main
       Yast.import "CommandLine"
       Yast.import "Mode"
 
-      @dopackages = true
       @cmdline = {
         "id"         => "ayast_setup",
         "help"       => _(

src/lib/autoinstall/clients/ayast_setup.rb

@@ -42,7 +42,14 @@ module AyastSetup
       WFM = Yast::WFM
       Profile  = Yast::Profile
       Builtins = Yast::Builtins
-      def Setup
+
+      # Configures up the system according to the current AutoYaST profile
+      #
+      # It relies on clients like `inst_autopost`, `inst_rpmcopy` or
+      # `inst_autoconfigure`.
+      #
+      # @param install_packages [Boolean] Install patterns and packages
+      def Setup(install_packages: true)
         textdomain "autoinst"
         Yast::AutoInstall.Save
         Yast::Wizard.CreateDialog
@@ -74,7 +81,7 @@ def Setup
           []
         )
 
-        if @dopackages
+        if install_packages
           Yast::Pkg.TargetInit("/", false)
           WFM.CallFunction("inst_rpmcopy", [])
         end
@@ -91,7 +98,7 @@ def openFile(options)
           Yast::CommandLine.Error(_("Path to AutoYaST profile must be set."))
           return false
         end
-        @dopackages = false if Ops.get_string(options, "dopackages", "yes") == "no"
+        install_packages = options["dopackages"] != "no"
         if SCR.Read(
           path(".target.lstat"),
           Ops.get_string(options, "filename", "")
@@ -108,7 +115,7 @@ def openFile(options)
           return false
         end
 
-        Setup()
+        Setup(install_packages: install_packages)
         true
       end
 

test/lib/clients/ayast_setup_test.rb

@@ -64,7 +64,6 @@ class DummyClient < Module
       allow(Yast::Package).to receive(:Installed).and_return(true)
       allow(Yast::Pkg).to receive(:TargetInit)
       allow(subject).to receive(:restart_initscripts)
-      subject.dopackages = dopackages
     end
 
     it "saves the current profile if modified" do
@@ -79,9 +78,17 @@ class DummyClient < Module
       subject.Setup
     end
 
-    context "when dopackages is enabled" do
-      let(:dopackages) { true }
+    context "when install_packages is set to true" do
+      it "installs given post installation packages / patterns when not installed yet" do
+        expect(Yast::Package).to receive(:Installed).and_return(false)
+        expect(Yast::AutoinstSoftware).to receive(:addPostPackages).with(["vim"])
+        expect(Yast::WFM).to receive(:CallFunction).with("inst_rpmcopy", [])
 
+        subject.Setup(install_packages: true)
+      end
+    end
+
+    context "when install_packages is set to specified" do
       it "installs given post installation packages / patterns when not installed yet" do
         expect(Yast::Package).to receive(:Installed).and_return(false)
         expect(Yast::AutoinstSoftware).to receive(:addPostPackages).with(["vim"])
@@ -91,11 +98,11 @@ class DummyClient < Module
       end
     end
 
-    context "when dopackages is disabled" do
+    context "when install_packages is set to false" do
       it "does not try to install given post installation packages / patterns" do
         expect(Yast::WFM).to_not receive(:CallFunction).with("inst_rpmcopy", [])
 
-        subject.Setup
+        subject.Setup(install_packages: false)
       end
     end