commit: c43de87222e118738e21afe8ea0cfafb866c7044 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Feb 12 02:54:40 2013 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Sat Jun 14 03:57:22 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c43de872
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. --- catalyst/support.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/catalyst/support.py b/catalyst/support.py index bc24130..d5dbfec 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -292,15 +292,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)):