do not crash when SSL certificate download fails (bnc#891896)

- 3.1.102
yast · Aug 14, 2014 · 4c416e2 · 4c416e2
1 parent 61b0ac9
commit 4c416e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 14 12:34:50 UTC 2014 - lslezak@suse.cz
+
+- do not crash when SSL certificate download fails (bnc#891896)
+- 3.1.102
+
 -------------------------------------------------------------------
 Thu Aug 14 10:57:03 UTC 2014 - lslezak@suse.cz
 

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

diff --git a/src/clients/scc_auto.rb b/src/clients/scc_auto.rb
@@ -154,11 +154,11 @@ def write
       # nil = use the default URL
       @registration = ::Registration::Registration.new(url)
 
-      if @config.reg_server_cert && !@config.reg_server_cert.empty?
-        import_certificate(@config.reg_server_cert)
-      end
-
       ret = ::Registration::ConnectHelpers.catch_registration_errors do
+        if @config.reg_server_cert && !@config.reg_server_cert.empty?
+          import_certificate(@config.reg_server_cert)
+        end
+
         base_product = ::Registration::SwMgmt.find_base_product
         distro_target = base_product["register_target"]
 

diff --git a/src/lib/registration/new_messages.rb b/src/lib/registration/new_messages.rb
@@ -5,12 +5,7 @@
 textdomain "registration"
 
 NEW_TEXTS = [
-  # error message, %s is URL
-  _("Cannot download SSL certificate from\n%s"),
-  _("Import File..."),
   _("SSL Certificate"),
-  # progress message
-  _("Importing certificate..."),
   # checkbox: use SLP discovery later again in the installed system
   _("Use SLP Discovery Also Later in Installed System")
 ]