Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2022-10-27 13:54:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Thu Oct 27 13:54:00 2022 rev:543 rq:1031177 version:4.5.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2022-10-15
16:36:23.630000059 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new.2275/yast2.changes 2022-10-27
13:54:34.724691889 +0200
@@ -1,0 +2,8 @@
+Tue Oct 25 08:32:48 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Improve logging in the ProductControl module, use the new
+ "log.group" call to group logs for each workflow step
+ (bsc#1204625)
+- 4.5.18
+
+-------------------------------------------------------------------
Old:
----
yast2-4.5.17.tar.bz2
New:
----
yast2-4.5.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.1ldtkW/_old 2022-10-27 13:54:35.412695398 +0200
+++ /var/tmp/diff_new_pack.1ldtkW/_new 2022-10-27 13:54:35.420695439 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.17
+Version: 4.5.18
Release: 0
Summary: YaST2 Main Package
@@ -54,8 +54,8 @@
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# for XML module
BuildRequires: rubygem(%rb_default_ruby_abi:nokogiri)
-# yast/rspec/helpers.rb
-BuildRequires: yast2-ruby-bindings >= 4.4.7
+# log.group call
+BuildRequires: yast2-ruby-bindings >= 4.5.4
BuildRequires: yast2-testsuite
# Nested items in tables
BuildRequires: yast2-ycp-ui-bindings >= 4.3.3
@@ -90,8 +90,8 @@
Requires: yast2-perl-bindings
# Pkg.Resolvables() with "path" search support
Requires: yast2-pkg-bindings >= 4.3.7
-# for y2start
-Requires: yast2-ruby-bindings >= 3.2.10
+# log.group
+Requires: yast2-ruby-bindings >= 4.5.4
# Nested items in tables
Requires: yast2-ycp-ui-bindings >= 4.3.3
Requires: yui_backend
++++++ yast2-4.5.17.tar.bz2 -> yast2-4.5.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-4.5.17/library/control/src/modules/ProductControl.rb
new/yast2-4.5.18/library/control/src/modules/ProductControl.rb
--- old/yast2-4.5.17/library/control/src/modules/ProductControl.rb
2022-10-14 17:31:35.000000000 +0200
+++ new/yast2-4.5.18/library/control/src/modules/ProductControl.rb
2022-10-25 17:20:01.000000000 +0200
@@ -1227,8 +1227,6 @@
while Ops.greater_or_equal(@current_step, 0) &&
Ops.less_than(@current_step, Builtins.size(modules))
step = Ops.get(modules, @current_step, {})
- Builtins.y2milestone("Current step: %1", step)
-
step_name = Ops.get_string(step, "name", "")
# BNC #401319
# if "execute" is defined, it's called without modifications
@@ -1267,98 +1265,107 @@
end
end
# Continue in 'while' means 'next step'
- next if do_continue
+ if do_continue
+ log.info "Skipping step #{step.inspect}"
+ next
+ end
argterm = getClientTerm(step, defaults, former_result)
- Builtins.y2milestone("Running module: %1 (%2)", argterm, @current_step)
- Builtins.y2milestone("Calling %1", argterm)
+ result = nil
+ log.group("#{step["label"]} #{step["name"].inspect}") do
+ Builtins.y2milestone("Running module: %1 (%2)", argterm,
@current_step)
+
+ Builtins.y2milestone("Calling %1", argterm)
+
+ args = []
+ i = 0
+ while Ops.less_than(i, Builtins.size(argterm))
+ Ops.set(args, i, Ops.get(argterm, i))
+ i = Ops.add(i, 1)
+ end
- args = []
- i = 0
- while Ops.less_than(i, Builtins.size(argterm))
- Ops.set(args, i, Ops.get(argterm, i))
- i = Ops.add(i, 1)
- end
+ UI.WizardCommand(term(:SetCurrentStep, step_id))
+ @CurrentWizardStep = step_id
- UI.WizardCommand(term(:SetCurrentStep, step_id))
- @CurrentWizardStep = step_id
+ # Register what step we are going to run
+ if !Stage.initial && !SCR.Write(
+ path(".target.string"),
+ Installation.current_step,
+ step_id
+ )
+ Builtins.y2error("Error writing step identifier")
+ end
- # Register what step we are going to run
- if !Stage.initial && !SCR.Write(
- path(".target.string"),
- Installation.current_step,
- step_id
- )
- Builtins.y2error("Error writing step identifier")
- end
+ client_name = getClientName(step_name, step_execute)
- client_name = getClientName(step_name, step_execute)
+ # Check if client exist before continuing
+ if WFM.ClientExists(client_name)
+ Hooks.run("before_#{step_name}")
- # Check if client exist before continuing
- if WFM.ClientExists(client_name)
- Hooks.run("before_#{step_name}")
-
- result = WFM.CallFunction(client_name, args)
-
- # This code will be triggered before the red pop window appears on
the user's screen
- Hooks.run("installation_failure") if result == false
-
- result = Convert.to_symbol(result)
-
- Hooks.run("after_#{step_name}")
- else
- # Client not found. Ask the user if want to continue (related to
bsc#1180954)
- log.error("Client '#{client_name}' not found")
-
- text = format(
- # TRANSLATORS: Message warning the user that a client is missing
where %{client} is
- # replaced by the client name (e.g. "registration", "user")
- _(
- "Something went wrong and the expected '%{client}' dialog was
not found.\n\n" \
- "Would you like to skip the dialog and continue anyway?"
- ),
- client: client_name
- )
+ result = WFM.CallFunction(client_name, args)
+
+ # This code will be triggered before the red pop window appears on
the user's screen
+ Hooks.run("installation_failure") if result == false
- options = { yes: Label.ContinueButton, no: Label.AbortButton }
- continue = Yast2::Popup.show(text, buttons: options) == :yes
+ result = Convert.to_symbol(result)
- if continue
- log.warn("Continuing after skipping the '#{client_name}' missing
client")
- # If user decided to continue, uses the former_result (:next or
:back)
- result = former_result
+ Hooks.run("after_#{step_name}")
else
- # :abort because user decided to not continue
- result = :abort
+ # Client not found. Ask the user if want to continue (related to
bsc#1180954)
+ log.error("Client '#{client_name}' not found")
+
+ text = format(
+ # TRANSLATORS: Message warning the user that a client is missing
where %{client} is
+ # replaced by the client name (e.g. "registration", "user")
+ _(
+ "Something went wrong and the expected '%{client}' dialog was
not found.\n\n" \
+ "Would you like to skip the dialog and continue anyway?"
+ ),
+ client: client_name
+ )
+
+ options = { yes: Label.ContinueButton, no: Label.AbortButton }
+ continue = Yast2::Popup.show(text, buttons: options) == :yes
+
+ if continue
+ log.warn("Continuing after skipping the '#{client_name}' missing
client")
+ # If user decided to continue, uses the former_result (:next or
:back)
+ result = former_result
+ else
+ # :abort because user decided to not continue
+ result = :abort
+ end
end
- end
- Builtins.y2milestone("Calling %1 returned %2", argterm, result)
+ Builtins.y2milestone("Calling %1 returned %2", argterm, result)
- # bnc #369846
- if [:access, :ok].include?(result)
- Builtins.y2milestone("Evaluating %1 as it was `next", result)
- result = :next
- end
+ # bnc #369846
+ if [:access, :ok].include?(result)
+ Builtins.y2milestone("Evaluating %1 as it was `next", result)
+ result = :next
+ end
- # Clients can break the installation/workflow
- Wizard.RestoreNextButton
- Wizard.RestoreAbortButton
- Wizard.RestoreBackButton
-
- # Remove file if step was run and returned (without a crash);
- if Ops.less_than(@current_step, Ops.subtract(Builtins.size(modules),
1)) &&
- !Stage.initial && !Convert.to_boolean(
- SCR.Execute(path(".target.remove"), Installation.current_step)
- )
- Builtins.y2error("Error removing step identifier")
- end
+ # Clients can break the installation/workflow
+ Wizard.RestoreNextButton
+ Wizard.RestoreAbortButton
+ Wizard.RestoreBackButton
+
+ # Remove file if step was run and returned (without a crash);
+ if Ops.less_than(@current_step, Ops.subtract(Builtins.size(modules),
1)) &&
+ !Stage.initial && !Convert.to_boolean(
+ SCR.Execute(path(".target.remove"), Installation.current_step)
+ )
+ Builtins.y2error("Error removing step identifier")
+ end
+
+ if retranslate
+ Builtins.y2milestone("retranslate")
+ retranslateWizardDialog
+ retranslate = false
+ end
- if retranslate
- Builtins.y2milestone("retranslate")
- retranslateWizardDialog
- retranslate = false
+ result
end
# If the module return nil, something basic went wrong.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.17/package/yast2.changes
new/yast2-4.5.18/package/yast2.changes
--- old/yast2-4.5.17/package/yast2.changes 2022-10-14 17:31:35.000000000
+0200
+++ new/yast2-4.5.18/package/yast2.changes 2022-10-25 17:20:01.000000000
+0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Oct 25 08:32:48 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Improve logging in the ProductControl module, use the new
+ "log.group" call to group logs for each workflow step
+ (bsc#1204625)
+- 4.5.18
+
+-------------------------------------------------------------------
Fri Oct 14 14:54:58 UTC 2022 - Steffen Winterfeldt <snw...@suse.com>
- remove #postprocess_url from RelURL class (jsc#SLE-22578, jsc#SLE-24584)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.17/package/yast2.spec
new/yast2-4.5.18/package/yast2.spec
--- old/yast2-4.5.17/package/yast2.spec 2022-10-14 17:31:35.000000000 +0200
+++ new/yast2-4.5.18/package/yast2.spec 2022-10-25 17:20:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.17
+Version: 4.5.18
Release: 0
Summary: YaST2 Main Package
@@ -54,8 +54,8 @@
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# for XML module
BuildRequires: rubygem(%rb_default_ruby_abi:nokogiri)
-# yast/rspec/helpers.rb
-BuildRequires: yast2-ruby-bindings >= 4.4.7
+# log.group call
+BuildRequires: yast2-ruby-bindings >= 4.5.4
BuildRequires: yast2-testsuite
# Nested items in tables
BuildRequires: yast2-ycp-ui-bindings >= 4.3.3
@@ -90,8 +90,8 @@
Requires: yast2-perl-bindings
# Pkg.Resolvables() with "path" search support
Requires: yast2-pkg-bindings >= 4.3.7
-# for y2start
-Requires: yast2-ruby-bindings >= 3.2.10
+# log.group
+Requires: yast2-ruby-bindings >= 4.5.4
# Nested items in tables
Requires: yast2-ycp-ui-bindings >= 4.3.3
Requires: yui_backend
