Hello community, here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2018-11-20 22:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old) and /work/SRC/openSUSE:Factory/.yast2-registration.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration" Tue Nov 20 22:31:47 2018 rev:25 rq:650233 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2018-11-10 16:48:50.524533901 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-registration.new.19453/yast2-registration.changes 2018-11-20 22:31:51.254617576 +0100 @@ -1,0 +2,6 @@ +Mon Nov 19 16:11:29 CET 2018 - schubi@suse.de + +- Improved error messages (bsc#1060151). +- 4.1.7 + +------------------------------------------------------------------- Old: ---- yast2-registration-4.1.6.tar.bz2 New: ---- yast2-registration-4.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.NWHhd1/_old 2018-11-20 22:31:51.846617212 +0100 +++ /var/tmp/diff_new_pack.NWHhd1/_new 2018-11-20 22:31:51.850617209 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.1.6 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-4.1.6.tar.bz2 -> yast2-registration-4.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.6/package/yast2-registration.changes new/yast2-registration-4.1.7/package/yast2-registration.changes --- old/yast2-registration-4.1.6/package/yast2-registration.changes 2018-11-06 16:14:40.000000000 +0100 +++ new/yast2-registration-4.1.7/package/yast2-registration.changes 2018-11-19 17:04:25.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 19 16:11:29 CET 2018 - schubi@suse.de + +- Improved error messages (bsc#1060151). +- 4.1.7 + +------------------------------------------------------------------- Tue Nov 6 13:56:48 UTC 2018 - dgonzalez@suse.com - Do not display a connection error when automatically trying to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.6/package/yast2-registration.spec new/yast2-registration-4.1.7/package/yast2-registration.spec --- old/yast2-registration-4.1.6/package/yast2-registration.spec 2018-11-06 16:14:40.000000000 +0100 +++ new/yast2-registration-4.1.7/package/yast2-registration.spec 2018-11-19 17:04:25.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.1.6 +Version: 4.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.6/src/lib/registration/connect_helpers.rb new/yast2-registration-4.1.7/src/lib/registration/connect_helpers.rb --- old/yast2-registration-4.1.6/src/lib/registration/connect_helpers.rb 2018-11-06 16:14:40.000000000 +0100 +++ new/yast2-registration-4.1.7/src/lib/registration/connect_helpers.rb 2018-11-19 17:04:25.000000000 +0100 @@ -94,28 +94,35 @@ rescue SUSE::Connect::ApiError => e log.error "Received error: #{e.response.inspect}" error_msg = e.message || "" + # TRANSLATORS: %d is an integer + error_code_message = _("HTTP error code: %d\n") % e.code case e.code when 401 add_update_hint(error_msg) if show_update_hint - report_error(message_prefix + _("Connection to registration server failed."), error_msg) + report_error(message_prefix + _("Connection to registration server failed."), + error_code_message + error_msg) when 404 # update the message when an old SMT server is found check_smt_api(error_msg) - report_error(message_prefix + _("Connection to registration server failed."), error_msg) + report_error(message_prefix + _("Connection to registration server failed."), + error_code_message + error_msg) when 422 if silent_reg_code_mismatch log.info "Reg code does not work for this product." else # Error popup - report_error(message_prefix + _("Connection to registration server failed."), error_msg) + report_error(message_prefix + _("Connection to registration server failed."), + error_code_message + error_msg) end when 400..499 - report_error(message_prefix + _("Registration client error."), error_msg) + report_error(message_prefix + _("Registration client error."), + error_code_message + error_msg) when 500..599 report_error(message_prefix + _("Registration server error.\n" \ "Retry the operation later."), error_msg) else - report_error(message_prefix + _("Connection to registration server failed."), error_msg) + report_error(message_prefix + _("Connection to registration server failed."), + error_code_message + error_msg) end false rescue ::Registration::ServiceError => e @@ -138,8 +145,7 @@ log.error "JSON parse error" # update the message when an old SMT server is found check_smt_api(e.message) - - report_error(message_prefix + _("Connection to registration server failed."), e.message) + report_error(message_prefix + _("Cannot parse the data from server."), e.message) rescue StandardError => e log.error("SCC registration failed: #{e.class}: #{e}, #{e.backtrace}") Yast::Report.Error(