Merge branch 'SLE-15-SP3' into merge-SLE-15-SP3

yast · Sep 28, 2022 · 730c331 · 730c331
2 parents 4095cae + 7c57dc5
commit 730c331
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 27 15:23:53 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Process the <ask-list/> section in an installed system once the
+  <general/> section is imported in the (bsc#1201953).
+- 4.4.40
+
 -------------------------------------------------------------------
 Fri Jul 22 11:31:20 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.4.39
+Version:        4.4.40
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/clients/inst_autopost.rb b/src/clients/inst_autopost.rb
@@ -69,15 +69,20 @@ def main
       Progress.NextStage
       Progress.Title(_("Checking for required packages..."))
 
+<<<<<<< HEAD
       Y2Autoinstall::Ask::Runner.new(
         Yast::Profile.current, stage: Y2Autoinstall::Ask::Stage::CONT
       ).run
 
+=======
+>>>>>>> SLE-15-SP3
       Builtins.y2milestone("Steps: %1", steps)
 
       general_settings = Profile.current.fetch("general", {})
       AutoinstGeneral.Import(general_settings) unless general_settings.empty?
 
+      askDialog
+
       importer = Y2Autoinstallation::Importer.new(Profile.current)
       modules_to_write.each do |description|
         Builtins.y2milestone("current resource: %1", description.resource_name)