Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-registration for
openSUSE:Factory checked in at 2022-10-27 13:54:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Thu Oct 27 13:54:05 2022 rev:93 rq:1031271 version:4.5.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes
2022-10-22 14:13:11.388752611 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-registration.new.2275/yast2-registration.changes
2022-10-27 13:54:44.236740409 +0200
@@ -1,0 +2,7 @@
+Tue Oct 25 12:19:45 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Improve logging, use the new "log.group" call to group logs for
+ each registration step (bsc#1204625)
+- 4.5.7
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.5.6.tar.bz2
New:
----
yast2-registration-4.5.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.9i5fpq/_old 2022-10-27 13:54:45.068744653 +0200
+++ /var/tmp/diff_new_pack.9i5fpq/_new 2022-10-27 13:54:45.072744673 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.5.6
+Version: 4.5.7
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
@@ -38,15 +38,15 @@
# ProductSpec API
BuildRequires: yast2-packager >= 4.4.13
BuildRequires: yast2-update >= 3.1.36
-# yast/rspec/helpers.rb
-BuildRequires: yast2-ruby-bindings >= 4.4.7
+# log.group call
+BuildRequires: yast2-ruby-bindings >= 4.5.4
# Y2Packager::NewRepositorySetup
Requires: yast2 >= 4.4.42
# "dupAllowVendorChange" option in Pkg.SetSolverFlags()
Requires: yast2-pkg-bindings >= 3.1.34
-# N_() method
-Requires: yast2-ruby-bindings >= 3.1.12
+# log.group call
+Requires: yast2-ruby-bindings >= 4.5.4
# uses Fiddle instead of FFI
Requires: suseconnect-ruby-bindings > 0.0.4
Requires: yast2-add-on >= 3.1.8
++++++ yast2-registration-4.5.6.tar.bz2 -> yast2-registration-4.5.7.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.5.6/package/yast2-registration.changes
new/yast2-registration-4.5.7/package/yast2-registration.changes
--- old/yast2-registration-4.5.6/package/yast2-registration.changes
2022-10-21 14:41:17.000000000 +0200
+++ new/yast2-registration-4.5.7/package/yast2-registration.changes
2022-10-26 09:28:13.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Oct 25 12:19:45 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Improve logging, use the new "log.group" call to group logs for
+ each registration step (bsc#1204625)
+- 4.5.7
+
+-------------------------------------------------------------------
Wed Oct 19 08:13:54 UTC 2022 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
- Add reader for products defined in a YAML file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.5.6/package/yast2-registration.spec
new/yast2-registration-4.5.7/package/yast2-registration.spec
--- old/yast2-registration-4.5.6/package/yast2-registration.spec
2022-10-21 14:41:17.000000000 +0200
+++ new/yast2-registration-4.5.7/package/yast2-registration.spec
2022-10-26 09:28:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.5.6
+Version: 4.5.7
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
@@ -38,15 +38,15 @@
# ProductSpec API
BuildRequires: yast2-packager >= 4.4.13
BuildRequires: yast2-update >= 3.1.36
-# yast/rspec/helpers.rb
-BuildRequires: yast2-ruby-bindings >= 4.4.7
+# log.group call
+BuildRequires: yast2-ruby-bindings >= 4.5.4
# Y2Packager::NewRepositorySetup
Requires: yast2 >= 4.4.42
# "dupAllowVendorChange" option in Pkg.SetSolverFlags()
Requires: yast2-pkg-bindings >= 3.1.34
-# N_() method
-Requires: yast2-ruby-bindings >= 3.1.12
+# log.group call
+Requires: yast2-ruby-bindings >= 4.5.4
# uses Fiddle instead of FFI
Requires: suseconnect-ruby-bindings > 0.0.4
Requires: yast2-add-on >= 3.1.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.5.6/src/lib/registration/clients/inst_scc.rb
new/yast2-registration-4.5.7/src/lib/registration/clients/inst_scc.rb
--- old/yast2-registration-4.5.6/src/lib/registration/clients/inst_scc.rb
2022-10-21 14:41:17.000000000 +0200
+++ new/yast2-registration-4.5.7/src/lib/registration/clients/inst_scc.rb
2022-10-26 09:28:13.000000000 +0200
@@ -137,18 +137,28 @@
# run the addon selection dialog
def select_addons
- # FIXME: available_addons is called just to fill cache with popup
- return :cancel if get_available_addons == :cancel
+ log.group "Select add-ons" do |group|
+ # FIXME: available_addons is called just to fill cache with popup
+ return :cancel if get_available_addons == :cancel
+
+ if Registration::Addon.find_all(@registration).empty?
+ log.info("Skipping an empty add on selection screen.")
+ return :skip
+ end
- if Registration::Addon.find_all(@registration).empty?
- log.info("Skipping an empty add on selection screen.")
- return :skip
- end
+ # FIXME: workaround to reference between old way and new storage in
Addon metaclass
+ @selected_addons = Registration::Addon.selected
+ ::Registration::Storage::InstallationOptions.instance.selected_addons
= @selected_addons
+
+ ret =
Registration::UI::AddonSelectionRegistrationDialog.run(@registration)
+
+ group.summary = "Selected #{@selected_addons.size} add-ons"
+ if !Registration::Addon.auto_selected.empty?
+ group.summary += "(+ #{Registration::Addon.auto_selected.size} auto
selected)"
+ end
- # FIXME: workaround to reference between old way and new storage in
Addon metaclass
- @selected_addons = Registration::Addon.selected
- ::Registration::Storage::InstallationOptions.instance.selected_addons =
@selected_addons
- Registration::UI::AddonSelectionRegistrationDialog.run(@registration)
+ ret
+ end
end
# load available addons from SCC server
@@ -175,12 +185,14 @@
# register all selected addons
# back returns directly to the extensions selection
def register_addons
- return false if init_registration == :cancel
- addons = Registration::Addon.selected + Registration::Addon.auto_selected
- addons = Registration::Addon.registration_order(addons)
- ret = registration_ui.register_addons(addons, @known_reg_codes)
- ret = :extensions if ret == :back
- ret
+ log.group "Register add-ons" do
+ return false if init_registration == :cancel
+ addons = Registration::Addon.selected +
Registration::Addon.auto_selected
+ addons = Registration::Addon.registration_order(addons)
+ ret = registration_ui.register_addons(addons, @known_reg_codes)
+ ret = :extensions if ret == :back
+ ret
+ end
end
# do some sanity checks and decide which workflow will be used
@@ -266,13 +278,15 @@
# preselect the addon products and in installed system run the package
manager
def pkg_manager
- ::Registration::SwMgmt.select_addon_products
+ log.group "Select add-on products to install" do
+ ::Registration::SwMgmt.select_addon_products
- # run the package manager only in installed system and if a new addon
was registered
- if Mode.normal && Registration::Addon.registered !=
@addons_registered_orig
- WFM.call("sw_single")
- else
- :next
+ # run the package manager only in installed system and if a new addon
was registered
+ if Mode.normal && Registration::Addon.registered !=
@addons_registered_orig
+ WFM.call("sw_single")
+ else
+ :next
+ end
end
end
@@ -294,7 +308,11 @@
def workflow_aliases
{
# skip this when going back
- "check" => ->() { registration_check },
+ "check" => lambda do
+ log.group("Initialize registration") do
+ registration_check
+ end
+ end,
"register" => ->() { register_base_system },
"select_addons" => ->() { select_addons },
"update" => [->() { update_registration }, true],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.5.6/src/lib/registration/registration_ui.rb
new/yast2-registration-4.5.7/src/lib/registration/registration_ui.rb
--- old/yast2-registration-4.5.6/src/lib/registration/registration_ui.rb
2022-10-21 14:41:17.000000000 +0200
+++ new/yast2-registration-4.5.7/src/lib/registration/registration_ui.rb
2022-10-26 09:28:13.000000000 +0200
@@ -330,31 +330,48 @@
attr_accessor :registration
def register_system
- options = Storage::InstallationOptions.instance
- base_product = SwMgmt.find_base_product
- distro_target = base_product["register_target"]
-
- log.info "Registering system, distro_target: #{distro_target}"
-
- Yast::Popup.Feedback(_(CONTACTING_MESSAGE),
- _("Registering the System...")) do
- registration.register(options.email, options.reg_code, distro_target)
+ log.group "Register the system" do |group|
+ options = Storage::InstallationOptions.instance
+ base_product = SwMgmt.find_base_product
+ distro_target = base_product["register_target"]
+
+ log.info "Registering system, distro_target: #{distro_target}"
+
+ Yast::Popup.Feedback(_(CONTACTING_MESSAGE),
+ _("Registering the System...")) do
+
+ group.summary = "System \"#{distro_target}\" registered with email "
\
+ + options.email.inspect
+
+ if registration.url && registration.url !=
SUSE::Connect::YaST::DEFAULT_URL
+ group.summary += " using server #{registration.url}"
+ end
+
+ registration.register(options.email, options.reg_code, distro_target)
+ end
end
end
# the credentials are read from Storage::InstallationOptions
def register_base_product
- options = Storage::InstallationOptions.instance
- return if options.base_registered
+ log.group "Register the base product" do |group|
+ options = Storage::InstallationOptions.instance
+ return nil if options.base_registered
+
+ # then register the product(s)
+ base_product = SwMgmt.find_base_product
+
+ Yast::Popup.Feedback(_(CONTACTING_MESSAGE),
+ _("Registering %s ...") % SwMgmt.product_label(base_product)) do
+ base_product_data = SwMgmt.base_product_to_register
+ base_product_data["reg_code"] = options.reg_code
+ ret = registration.register_product(base_product_data, options.email)
- # then register the product(s)
- base_product = SwMgmt.find_base_product
+ group.summary = "Registered \"#{base_product_data["name"]}-" \
+ "#{base_product_data["version"]}-#{base_product_data["arch"]}\""
if ret
- Yast::Popup.Feedback(_(CONTACTING_MESSAGE),
- _("Registering %s ...") % SwMgmt.product_label(base_product)) do
- base_product_data = SwMgmt.base_product_to_register
- base_product_data["reg_code"] = options.reg_code
- registration.register_product(base_product_data, options.email)
+ ret
+ end
end
end
@@ -403,7 +420,9 @@
"version" => product.version
}
- registration.register_product(product_data)
+ log.group "Register #{product.friendly_name.inspect}" do
+ registration.register_product(product_data)
+ end
end
# remember the added service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.5.6/test/registration_ui_test.rb
new/yast2-registration-4.5.7/test/registration_ui_test.rb
--- old/yast2-registration-4.5.6/test/registration_ui_test.rb 2022-10-21
14:41:17.000000000 +0200
+++ new/yast2-registration-4.5.7/test/registration_ui_test.rb 2022-10-26
09:28:13.000000000 +0200
@@ -46,7 +46,7 @@
.and_return([])
options = Registration::Storage::InstallationOptions.instance
- allow(options).to receive(:email).twice.and_return(email)
+ allow(options).to receive(:email).and_return(email)
allow(options).to receive(:reg_code).and_return(reg_code)
allow(options).to receive(:base_registered).and_return(false)
