Skip to content

Commit

Permalink
Move self-update and software manager initialization
Browse files Browse the repository at this point in the history
* They're moved to the beginning of System Analysis.
  • Loading branch information
imobachgs committed Aug 11, 2016
1 parent 297eff6 commit 6188a8c
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions src/lib/installation/clients/inst_system_analysis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ def main
actions_doing = []
actions_functions = []

actions_todo << _("Initialize software manager")
actions_doing << _("Initializing software manager...")
actions_functions << fun_ref(method(:InitInstallationRepositories), "boolean ()")

actions_todo << _("Installer update")
actions_doing << _("Searching for installer updates...")
actions_functions << fun_ref(method(:self_update), "boolean ()")

Builtins.y2milestone("Probing done: %1", Installation.probing_done)
# skip part of probes as it doesn't change, but some parts (mostly disks
# that can be activated) need rerun see BNC#865579
Expand Down Expand Up @@ -135,10 +143,6 @@ 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 ()")

Progress.New(
# TRANSLATORS: dialog caption
_("System Probing"),
Expand Down Expand Up @@ -354,6 +358,13 @@ def InitInstallationRepositories
ret
end

# Runs installer's self-update
#
# @see inst_update_installer client
def self_update
WFM.CallFunction("inst_update_installer", [])
end

def FilesFromOlderSystems
# FATE #300421: Import ssh keys from previous installations
# FATE #120103: Import Users From Existing Partition
Expand Down

0 comments on commit 6188a8c

Please sign in to comment.