[ARVADOS] updated: 80ada0673ac37cf1d3b70918a214f2ade484ec45

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_manage_ssh_keys.html.erb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

       via  80ada0673ac37cf1d3b70918a214f2ade484ec45 (commit)
      from  c81c0efd74addbdb2cf3ef2114ed96123d5a881e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 80ada0673ac37cf1d3b70918a214f2ade484ec45
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sat Aug 2 20:36:12 2014 +0200

    Do not blow up on the 'Manage account' page if the db contains an ssh
    key record that contains an invalid ssh key.
    
    no issue #

diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 1165ffa..17b64b2 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -30,7 +30,13 @@
             <td style="word-break:break-all;">
               <% if key[:public_key] && key[:public_key].size > 0 %>
                 <div>
-                  <span title="<%=key[:public_key]%>"> <%= SSHKey.fingerprint key[:public_key] %> </span>
+                  <span title="<%=key[:public_key]%>"> <%=
+                    begin
+                      SSHKey.fingerprint key[:public_key]
+                    rescue
+                      "INVALID KEY: " + key[:public_key]
+                    end
+                   %> </span>
                 </div>
               <% else %>
                   <%= key[:public_key] %>

-----------------------------------------------------------------------


hooks/post-receive
--