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

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

Revision: 685
          http://safekeep.svn.sourceforge.net/safekeep/?rev=685&view=rev
Author:   dimi
Date:     2010-11-19 08:57:27 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
Avoid subprocess where we can easily

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

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2010-11-19 08:34:35 UTC (rev 684)
+++ safekeep/trunk/safekeep	2010-11-19 08:57:27 UTC (rev 685)
@@ -149,9 +149,9 @@
         error('%s failed: %s' % (cmd, ret));
     return ret
 
-def try_to_run(args, shell=False):
+def try_to_run(args):
     try:
-        rc = do_spawn(args, shell=shell)
+        rc = do_spawn(args)
     except OSError, ex:
         return False
     return rc in (0,1)
@@ -1104,7 +1104,7 @@
                     if backup_user is not work_user:
                         gencmd = 'su -s /bin/sh -c %s - %s' % (commands.mkarg(gencmd), backup_user)
                     debug(gencmd)
-                    if subprocess.Popen(gencmd, shell=True).wait():
+                    if os.system(gencmd):
                         error('%s: Failed to generate key %s. Skipping client.' % (id, privatekeyfile))
                         break
             if not os.path.isfile(publickeyfile):


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