[minion-cvs] Do error recovery properly when shred hits ulimits

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv19025/lib/mixminion

Modified Files:
	Common.py 
Log Message:
Do error recovery properly when shred hits ulimits

Index: Common.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Common.py,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- Common.py	7 Mar 2004 06:31:46 -0000	1.134
+++ Common.py	18 Mar 2004 05:55:50 -0000	1.135
@@ -763,13 +763,13 @@
                 if os.path.exists(f):
                     _overwriteFile(f)
                     os.unlink(f)
-
-        if blocking:
-            try:
-                os.waitpid(pid, 0)
-            except OSError:
-                # sigchild handler might get to the pid first.
-                pass
+        else:
+            if blocking:
+                try:
+                    os.waitpid(pid, 0)
+                except OSError:
+                    # sigchild handler might get to the pid first.
+                    pass
 
 #----------------------------------------------------------------------
 # Logging