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 670D013877A for ; Tue, 2 Sep 2014 02:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87088E0B92; Tue, 2 Sep 2014 02:33:06 +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 0B3CBE0B92 for ; Tue, 2 Sep 2014 02:33:05 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id B647F33F883; Tue, 2 Sep 2014 02:33:04 +0000 (UTC) From: Brian Dolbec To: catalyst@gentoo.org, gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 2/7] Remove unused variable new and an undefined variable s. Date: Mon, 1 Sep 2014 19:31:36 -0700 Message-Id: <1409625101-27112-3-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> References: <1409625101-27112-1-git-send-email-dolsen@gentoo.org> 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-Type: multipart/mixed; boundary="------------1.9.3" X-Archives-Salt: da61ba10-22c5-4a42-87e6-e7eb609a5b8f X-Archives-Hash: 9b6d024be7548e6ea24c12600886a4cd This is a multi-part message in MIME format. --------------1.9.3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit 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(-) --------------1.9.3 Content-Type: text/x-patch; name="0002-Remove-unused-variable-new-and-an-undefined-variable.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="0002-Remove-unused-variable-new-and-an-undefined-variable.patch" 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)): --------------1.9.3--