Skip to content

Commit

Permalink
Adjust repository initialization for the online medium
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Sep 2, 2019
1 parent ef5a118 commit 4ce59e4
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion src/lib/y2packager/clients/inst_repositories_initialization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
require "yast"
require "y2packager/product"
require "y2packager/self_update_addon_repo"
require "y2packager/medium_type"

Yast.import "Packages"
Yast.import "PackageCallbacks"
Expand Down Expand Up @@ -51,6 +52,9 @@ def main
end

adjust_base_product_selection

merge_and_run_workflow if Y2Packager::MediumType.online?

:next
end

Expand All @@ -59,7 +63,7 @@ def main
# Initialize installation repositories
def init_installation_repositories
Yast::PackageCallbacks.RegisterEmptyProgressCallbacks
Yast::Packages.InitializeCatalogs
Yast::Packages.InitializeCatalogs unless Y2Packager::MediumType.online?
return false if Yast::Packages.InitFailed

Yast::Packages.InitializeAddOnProducts
Expand All @@ -75,6 +79,15 @@ def init_installation_repositories
true
end

# Merge selected product's workflow and go to next step
#
# @see Yast::WorkflowManager.merge_product_workflow
def merge_and_run_workflow
Yast::WorkflowManager.SetBaseWorkflow(false)
Yast::WorkflowManager.merge_product_workflow(Y2Packager::Product.selected_base)
Yast::ProductControl.RunFrom(Yast::ProductControl.CurrentStep + 1, true)
end

# Adjust product selection
#
# During installation, all products are selected by default. So if there
Expand Down

0 comments on commit 4ce59e4

Please sign in to comment.