SF.net SVN: safekeep:[740] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 740
          http://safekeep.svn.sourceforge.net/safekeep/?rev=740&view=rev
Author:   dimi
Date:     2011-03-03 16:19:11 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Bail if we can't read the .ssh/authorized_keys file while deploying keys.

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2011-03-03 16:12:45 UTC (rev 739)
+++ safekeep/trunk/safekeep	2011-03-03 16:19:11 UTC (rev 740)
@@ -1224,8 +1224,8 @@
             cmd = [basessh, '%s@%s' % (cfg['user'], cfg['host']), "if test -f .ssh/authorized_keys; then cat .ssh/authorized_keys; fi"]
             authtext = call(cmd)
             if authtext is None:
-                warn('%s: Failed to read the %s@%s:~/.ssh/authorized_keys file.' % (id, cfg['user'], cfg['host']))
-                authtext = []
+                error('%s: Failed to read the %s@%s:~/.ssh/authorized_keys file.' % (id, cfg['user'], cfg['host']))
+                continue
             auth_keys = parse_authorized_keys(authtext)
             this_keys = parse_authorized_keys(output)
             new_keys = []


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.