Skip to content

Commit

Permalink
Merge pull request #882 from yast/cleanup
Browse files Browse the repository at this point in the history
Cleanup
  • Loading branch information
jreidinger committed Jan 2, 2019
2 parents d6420c3 + 9837e33 commit 45bc1b8
Show file tree
Hide file tree
Showing 55 changed files with 119 additions and 1,244 deletions.
2 changes: 1 addition & 1 deletion library/Makefile.am
@@ -1,3 +1,3 @@
# Makefile.am for yast2/library

SUBDIRS = types runlevel sequencer xml commandline desktop wizard control cwm log system packages cron network gpg general systemd mail
SUBDIRS = types sequencer xml commandline desktop wizard control cwm log system packages network gpg general systemd
1 change: 0 additions & 1 deletion library/control/src/Makefile.am
Expand Up @@ -5,7 +5,6 @@ module_DATA = \
modules/InstExtensionImage.rb \
modules/AutoinstData.rb \
modules/GetInstArgs.rb \
modules/DebugHooks.rb \
modules/InstError.rb \
modules/ProductControl.rb \
modules/ProductFeatures.rb \
Expand Down
164 changes: 0 additions & 164 deletions library/control/src/modules/DebugHooks.rb

This file was deleted.

35 changes: 0 additions & 35 deletions library/control/src/modules/ProductControl.rb
Expand Up @@ -52,7 +52,6 @@ def main
Yast.import "Label"
Yast.import "Wizard"
Yast.import "Report"
Yast.import "DebugHooks"
Yast.import "Popup"
Yast.import "FileUtils"
Yast.import "Installation"
Expand Down Expand Up @@ -121,8 +120,6 @@ def main

@_client_prefix = "inst_"

@stack = []

@first_id = ""

@current_step = 0
Expand Down Expand Up @@ -1220,15 +1217,6 @@ def retranslateWizardDialog
nil
end

def addToStack(name)
@stack = Builtins.add(@stack, name)
nil
end

def wasRun(name)
Builtins.contains(@stack, name)
end

def RunFrom(from, allow_back)
former_result = :next
final_result = nil
Expand Down Expand Up @@ -1320,15 +1308,8 @@ def RunFrom(from, allow_back)
argterm = getClientTerm(step, defaults, former_result)
Builtins.y2milestone("Running module: %1 (%2)", argterm, @current_step)

module_name = Builtins.symbolof(argterm)

Builtins.y2milestone("Calling %1", argterm)

if !wasRun(step_name)
DebugHooks.Checkpoint(Builtins.sformat("%1", module_name), true)
DebugHooks.Run(step_name, true)
end

args = []
i = 0
while Ops.less_than(i, Builtins.size(argterm))
Expand Down Expand Up @@ -1384,21 +1365,6 @@ def RunFrom(from, allow_back)
end
end

# Dont call debug hook scripts after installation is done. (#36831)
if Ops.less_than(@current_step, Ops.subtract(Builtins.size(modules), 1)) &&
!wasRun(step_name)
DebugHooks.Run(step_name, false)
else
Builtins.y2milestone(
"Not running debug hooks at the end of the installation"
)
end

# This should be safe (#36831)
DebugHooks.Checkpoint(step_name, false) # exit hook

addToStack(step_name)

if retranslate
Builtins.y2milestone("retranslate")
retranslateWizardDialog
Expand Down Expand Up @@ -1665,7 +1631,6 @@ def add_system_roles(new_roles)
publish function: :getProposalProperties, type: "map (string, string, string)"
publish function: :GetTranslatedText, type: "string (string)"
publish function: :Init, type: "boolean ()"
publish function: :wasRun, type: "boolean (string)"
publish function: :RunFrom, type: "symbol (integer, boolean)"
publish function: :Run, type: "symbol ()"
publish function: :SkippedSteps, type: "list <map> ()"
Expand Down
3 changes: 0 additions & 3 deletions library/cron/Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions library/cron/src/Makefile.am

This file was deleted.

100 changes: 0 additions & 100 deletions library/cron/src/modules/Cron.rb

This file was deleted.

20 changes: 0 additions & 20 deletions library/cron/src/scrconf/cron.scr

This file was deleted.

0 comments on commit 45bc1b8

Please sign in to comment.