better fingerprint handling

yast · Aug 1, 2014 · f1e48ff · f1e48ff
1 parent ba54822
commit f1e48ff
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/src/data/registration/autoyast_summary.erb b/src/data/registration/autoyast_summary.erb
@@ -35,12 +35,21 @@ textdomain "registration"
     <% if !@config.reg_server_cert.empty? %>
       <li><%= _("SSL Server Certificate URL: %s") % h(@config.reg_server_cert) %></li>
     <% end %>
-  </ul>
 
-  <h3><%= _("Extensions and Modules") %></h3>
-  <ul>
-    <% @config.addons.each do |addon| %>
-      <li><%= h(addon["name"]) %></li>
+    <% if !@config.reg_server_cert_fingerprint_type != nil %>
+      <li><%= _("SSL Certificate Fingerprint: %s") % h(
+          "#{@config.reg_server_cert_fingerprint} (#{@config.reg_server_cert_fingerprint_type})")
+      %></li>
     <% end %>
+
   </ul>
+
+  <% if !@config.addons.empty? %>
+    <h3><%= _("Extensions and Modules") %></h3>
+    <ul>
+      <% @config.addons.each do |addon| %>
+        <li><%= h(addon["name"]) %></li>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>
diff --git a/src/lib/registration/new_messages.rb b/src/lib/registration/new_messages.rb
@@ -7,8 +7,6 @@
 NEW_TEXTS = [
   # error message, %s is URL
   _("Cannot download SSL certificate from\n%s"),
-  # autoyast support for certificates
-  _("SSL Certificate Fingerprint: %s"),
   _("Import File..."),
   _("SSL Certificate"),
   # progress message

diff --git a/src/lib/registration/storage.rb b/src/lib/registration/storage.rb
@@ -150,6 +150,9 @@ def import(settings)
           import_addon["release_type"] = nil if a["release_type"] == "nil"
           import_addon
         end
+
+        @reg_server_cert_fingerprint_type = settings["reg_server_cert_fingerprint_type"]
+        @reg_server_cert_fingerprint = settings["reg_server_cert_fingerprint"]
       end
     end
   end

diff --git a/src/lib/registration/sw_mgmt.rb b/src/lib/registration/sw_mgmt.rb
@@ -78,9 +78,10 @@ def self.zypp_config_writable!
     end
 
     def self.find_base_product
-#       return {"name" => "SLES", "arch" => "x86_64", "version" => "12",
-#         "release_type" => "DVD"
-#       }
+      # just for debugging:
+      # return {"name" => "SLES", "arch" => "x86_64", "version" => "12",
+      #   "release_type" => "DVD"
+      # }
 
       # during installation the products are :selected,
       # on a running system the products are :installed