Gentoo Archives: gentoo-catalyst

From: Brian Dolbec <dolsen@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [patch] Remove unused variable new and an undefined variable s.
Date: Wed, 27 Feb 2013 09:23:24
Message-Id: 1361956980.20292.12.camel@big_daddy.dol-sen.ca
1 again, this will need to be manually apllied to master
2
3 =====================================================
4
5
6 diff --git a/catalyst/support.py b/catalyst/support.py
7 index 0ddf98d..2133799 100644
8 @@ -433,15 +433,7 @@ def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,retur
9 if trg_fd[x] == src_fd[x]:
10 continue
11 if trg_fd[x] in src_fd[x+1:]:
12 - new=os.dup2(trg_fd[x],max(src_fd) + 1)
13 os.close(trg_fd[x])
14 - try:
15 - while True:
16 - src_fd[s.index(trg_fd[x])]=new
17 - except SystemExit, e:
18 - raise
19 - except:
20 - pass
21
22 # transfer the fds to their final pre-exec position.
23 for x in range(0,len(trg_fd)):
24
25
26 --
27 Brian Dolbec <dolsen@g.o>