Remove unused variable new and an undefined variable s.

Commit b3475906d5f51a21ecaf4ff048002a2f44face52 introduced an
undefined variable "s".  The code must always be hitting the
general except: pass block.  Seems useless, if not maybe it'll
spit out a true error, so the real problem can be fixed.  Removed it all.

diff --git a/catalyst/support.py b/catalyst/support.py
index 0ddf98d6b0c321d604794fdd1a5030f134a98eb1..21337996ef7b9035b5db6a9857590c7228c1473b 100644 (file)
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -433,15 +433,7 @@ def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,retur
                                if trg_fd[x] == src_fd[x]:
                                        continue
                                if trg_fd[x] in src_fd[x+1:]:
-                                       new=os.dup2(trg_fd[x],max(src_fd) + 1)
                                        os.close(trg_fd[x])
-                                       try:
-                                               while True:
-                                                       src_fd[s.index(trg_fd[x])]=new
-                                       except SystemExit, e:
-                                               raise
-                                       except:
-                                               pass
 
                        # transfer the fds to their final pre-exec position.
                        for x in range(0,len(trg_fd)):