Gentoo Archives: gentoo-catalyst

From: Brian Dolbec <dolsen@g.o>
To: gentoo-catalyst@l.g.o
Cc: Brian Dolbec <dolsen@g.o>
Subject: [gentoo-catalyst] [PATCH 2/3] Remove unused variable new and an undefined variable s.
Date: Sat, 14 Dec 2013 03:28:48
Message-Id: 1386991708-9385-3-git-send-email-dolsen@gentoo.org
In Reply to: [gentoo-catalyst] rewite-on-master patches round-3 by Brian Dolbec
1 Commit b3475906d5f51a21ecaf4ff048002a2f44face52 introduced an
2 undefined variable "s". The code must always be hitting the
3 general except: pass block. Seems useless, if not maybe it'll
4 spit out a true error, so the real problem can be fixed. Removed it all.
5 ---
6 catalyst/support.py | 8 --------
7 1 file changed, 8 deletions(-)
8
9 diff --git a/catalyst/support.py b/catalyst/support.py
10 index 0ddf98d..2133799 100644
11 --- a/catalyst/support.py
12 +++ b/catalyst/support.py
13 @@ -433,15 +433,7 @@ def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,retur
14 if trg_fd[x] == src_fd[x]:
15 continue
16 if trg_fd[x] in src_fd[x+1:]:
17 - new=os.dup2(trg_fd[x],max(src_fd) + 1)
18 os.close(trg_fd[x])
19 - try:
20 - while True:
21 - src_fd[s.index(trg_fd[x])]=new
22 - except SystemExit, e:
23 - raise
24 - except:
25 - pass
26
27 # transfer the fds to their final pre-exec position.
28 for x in range(0,len(trg_fd)):
29 --
30 1.8.3.2