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 687D9138010 for ; Tue, 4 Sep 2012 03:07:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90501E01A3; Tue, 4 Sep 2012 03:07:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5EAB2E01A3 for ; Tue, 4 Sep 2012 03:07:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCAC833D801 for ; Tue, 4 Sep 2012 03:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7EB75E543B for ; Tue, 4 Sep 2012 03:07:42 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1346728049.ed68a1bdb22fec478ac39b377961508cd3a30617.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildBuildDir.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ed68a1bdb22fec478ac39b377961508cd3a30617 X-VCS-Branch: master Date: Tue, 4 Sep 2012 03:07:42 +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: ae3b3402-0203-4894-885a-c02a5785a418 X-Archives-Hash: c044bd8d322f4c96c86e1d3d3fa0df43 commit: ed68a1bdb22fec478ac39b377961508cd3a30617 Author: Zac Medico gentoo org> AuthorDate: Tue Sep 4 03:07:29 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Sep 4 03:07:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ed68a1bd EbuildBuildDir: ignore rmdir failure, bug #400641 --- pym/_emerge/EbuildBuildDir.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py index 9773bd7..5d6a262 100644 --- a/pym/_emerge/EbuildBuildDir.py +++ b/pym/_emerge/EbuildBuildDir.py @@ -7,7 +7,6 @@ import portage from portage import os from portage.exception import PortageException from portage.util.SlotObject import SlotObject -import errno class EbuildBuildDir(SlotObject): @@ -98,10 +97,8 @@ class EbuildBuildDir(SlotObject): if catdir_lock.wait() == os.EX_OK: try: os.rmdir(self._catdir) - except OSError as e: - if e.errno not in (errno.ENOENT, - errno.ENOTEMPTY, errno.EEXIST, errno.EPERM): - raise + except OSError: + pass finally: catdir_lock.unlock()