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 4C120198005 for ; Wed, 27 Feb 2013 09:23:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35311E07AA; Wed, 27 Feb 2013 09:23:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89292E07AA for ; Wed, 27 Feb 2013 09:23:22 +0000 (UTC) Received: from [192.168.1.210] (unknown [24.86.176.233]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 67BCD33DEFC for ; Wed, 27 Feb 2013 09:23:21 +0000 (UTC) Message-ID: <1361956980.20292.12.camel@big_daddy.dol-sen.ca> Subject: [gentoo-catalyst] [patch] Remove unused variable new and an undefined variable s. From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Wed, 27 Feb 2013 01:23:00 -0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Archives-Salt: 79f11d65-6f37-4e3b-bfd9-d28e15d52a3c X-Archives-Hash: 762ce81a70c0ff6b8b5a18e1b02d9e35 again, this will need to be manually apllied to master ===================================================== diff --git a/catalyst/support.py b/catalyst/support.py index 0ddf98d..2133799 100644 @@ -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)): -- Brian Dolbec