Skip to content

Commit

Permalink
Merge pull request #425 from yast/more_logging_in_proposal
Browse files Browse the repository at this point in the history
add more logging to debug (bnc#994127)
  • Loading branch information
jreidinger committed Aug 24, 2016
2 parents 8f3ecaf + 717dd73 commit 9065345
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
6 changes: 5 additions & 1 deletion src/lib/installation/proposal_runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ def handle_skip

def pre_continue_handling
@skip = if Yast::UI.WidgetExists(Id(:skip))
Yast::UI.QueryWidget(Id(:skip), :Value)
val = Yast::UI.QueryWidget(Id(:skip), :Value)
log.info "there is :skip widget with value #{val.inspect}."
val
else
true
end
Expand Down Expand Up @@ -510,6 +512,8 @@ def submod_write_settings(submodule)
def write_settings
success = true

log.info "Writting settings for proposal"

@store.proposal_names do |submod|
submod_success = submod_write_settings(submod)
submod_success = true if submod_success.nil?
Expand Down
11 changes: 10 additions & 1 deletion src/lib/installation/proposal_store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,14 @@ def can_be_skipped?
return @can_skip unless @can_skip.nil?

@can_skip = if properties.key?("enable_skip")
log.info "properties skip available #{properties["enable_skip"].inspect}."
properties["enable_skip"] == "yes"
else
!["initial", "uml"].include?(@proposal_mode)
end

log.info "can skip set to #{@can_skip.inspect}."

@can_skip
end

Expand Down Expand Up @@ -390,11 +393,17 @@ def invalidate_description(client = nil)
end

def properties
@proposal_properties ||= Yast::ProductControl.getProposalProperties(
return @proposal_properties unless @proposal_properties.nil?

@proposal_properties = Yast::ProductControl.getProposalProperties(
Yast::Stage.stage,
Yast::Mode.mode,
@proposal_mode
)

log.info "Properties #{@proposal_properties.inspect}"

@proposal_properties
end

def make_proposal(client, force_reset: false, language_changed: false, callback: proc {})
Expand Down

0 comments on commit 9065345

Please sign in to comment.