Merge pull request #274 from yast/server_in_error

Server in error
yast · Aug 25, 2016 · 81c2f8f · 81c2f8f
2 parents c04b172 + def42ec
commit 81c2f8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 25 12:22:58 UTC 2016 - jreidinger@suse.com
+
+- write name of server which have certificate problem in error
+  popup (bnc#995526)
+- 3.1.187
+
 -------------------------------------------------------------------
 Wed Aug 24 12:21:26 UTC 2016 - jreidinger@suse.com
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.186
+Version:        3.1.187
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/registration/connect_helpers.rb b/src/lib/registration/connect_helpers.rb
@@ -257,6 +257,9 @@ def self.report_ssl_error(message, cert)
       msg = msg ? _(msg) : Storage::SSLErrors.instance.ssl_error_msg
       msg = message if msg.nil? || msg.empty?
 
+      url = UrlHelpers.registration_url || SUSE::Connect::YaST::DEFAULT_URL
+      msg = url + ": " + msg # workaround after string freeze
+
       Yast::Report.Error(
         error_with_details(_("Secure connection error: %s") % msg, ssl_error_details(cert))
       )