Skip to content

Commit

Permalink
Merge a7c84b0 into e356696
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Oct 24, 2019
2 parents e356696 + a7c84b0 commit 67a3113
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/lib/installation/clients/inst_system_analysis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,13 @@ def main
actions_doing << _("Searching for system files...")
actions_functions << fun_ref(method(:FilesFromOlderSystems), "boolean ()")

actions_todo << _("Initialize software manager")
actions_doing << _("Initializing software manager...")
actions_functions << fun_ref(method(:InitInstallationRepositories), "boolean ()")
# we cannot initialize during update software manager until we know target partition
# as base product is not known
if !Mode.update
actions_todo << _("Initialize software manager")
actions_doing << _("Initializing software manager...")
actions_functions << fun_ref(method(:InitInstallationRepositories), "boolean ()")
end

Progress.New(
# TRANSLATORS: dialog caption
Expand Down Expand Up @@ -150,11 +154,11 @@ def main
Installation.probing_done = true

# the last step is hidden
return :abort if ProductProfile.CheckCompliance(nil) == false
return :abort if !Mode.update && ProductProfile.CheckCompliance(nil) == false

Progress.Finish

return :abort unless @packager_initialized
return :abort if !Mode.update && !@packager_initialized

:next
end
Expand Down

0 comments on commit 67a3113

Please sign in to comment.