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

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

Revision: 737
          http://safekeep.svn.sourceforge.net/safekeep/?rev=737&view=rev
Author:   dimi
Date:     2011-03-03 15:57:48 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Oliver Henshaw <oli...@gm...>
do_spawn wrongly returned stdout as a multi-line string, 
rather than the array of strings most callers were
expecting. One caller was improperly converted from direct 
subprocess use to the call() wrapper, so its
output is joined to one long string as a minimal fix.

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

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2011-03-03 15:56:16 UTC (rev 736)
+++ safekeep/trunk/safekeep	2011-03-03 15:57:48 UTC (rev 737)
@@ -188,9 +188,9 @@
     child_out.close()
 
     if use_subprocess:
-        return (proc.wait(), ''.join(lines))
+        return (proc.wait(), lines)
     else:
-        return (0, ''.join(lines))
+        return (0, lines)
         
 
 def _spawn(args, stdin=None, stdout=False):
@@ -1226,8 +1226,8 @@
             authtext = call(cmd)
             if authtext is None:
                 warn('%s: Failed to read the authorized_keys file.' % id)
-                authtext = ''
-            auth_keys = parse_authorized_keys(authtext)
+                authtext = []
+            auth_keys = parse_authorized_keys(''.join(authtext))
             this_keys = parse_authorized_keys(output)
             new_keys = []
             for this_key in this_keys:


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