From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4BE5113838B for ; Thu, 11 Sep 2014 03:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D523AE09D2; Thu, 11 Sep 2014 03:26:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9AE63E09D4 for ; Thu, 11 Sep 2014 03:26:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7016034021D for ; Thu, 11 Sep 2014 03:26:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C52D530C for ; Thu, 11 Sep 2014 03:26:40 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402718242.c43de87222e118738e21afe8ea0cfafb866c7044.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/support.py X-VCS-Directories: catalyst/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c43de87222e118738e21afe8ea0cfafb866c7044 X-VCS-Branch: master Date: Thu, 11 Sep 2014 03:26:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 95441b0c-1394-4528-bf41-70378d9251cf X-Archives-Hash: fad7805024efd29e4dcd55556cd5c454 commit: c43de87222e118738e21afe8ea0cfafb866c7044 Author: Brian Dolbec gentoo org> AuthorDate: Tue Feb 12 02:54:40 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Jun 14 03:57:22 2014 +0000 URL: http://sources.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)): From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 86CD1138779 for ; Sat, 14 Jun 2014 05:58:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A8BEE097D; Sat, 14 Jun 2014 05:58:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DFCDE0932 for ; Sat, 14 Jun 2014 05:58:12 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61A3333FD30 for ; Sat, 14 Jun 2014 05:58:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2DFBF18362 for ; Sat, 14 Jun 2014 05:58:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402718242.c43de87222e118738e21afe8ea0cfafb866c7044.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/support.py X-VCS-Directories: catalyst/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c43de87222e118738e21afe8ea0cfafb866c7044 X-VCS-Branch: pending Date: Sat, 14 Jun 2014 05:58:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f94fca83-b4e0-4d60-bcf4-9517813ddbec X-Archives-Hash: 0eefa87db3307b65d1f9251cf89c3e8e Message-ID: <20140614055810.wTgAEG1aG6w_osQcrmKf0yiQ_-Wl5F3V1q6WZH6UW5c@z> commit: c43de87222e118738e21afe8ea0cfafb866c7044 Author: Brian Dolbec gentoo org> AuthorDate: Tue Feb 12 02:54:40 2013 +0000 Commit: Brian Dolbec gmail 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)):