From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5EC8F138334 for ; Mon, 10 Jun 2019 18:20:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDAD5E082F; Mon, 10 Jun 2019 18:20:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C34B5E082F for ; Mon, 10 Jun 2019 18:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91E06345BC2 for ; Mon, 10 Jun 2019 18:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 097585C0 for ; Mon, 10 Jun 2019 18:20:13 +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: <1560190749.c71fa8faf1fd83af7ab7422e0fbe25e0539cbb22.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/util/install_mask.py X-VCS-Directories: lib/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c71fa8faf1fd83af7ab7422e0fbe25e0539cbb22 X-VCS-Branch: master Date: Mon, 10 Jun 2019 18:20:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4946dcb0-68d3-4c93-ad2d-be4acce057b3 X-Archives-Hash: 17de7cf35d6ecf20a33fb25373654b6d commit: c71fa8faf1fd83af7ab7422e0fbe25e0539cbb22 Author: Zac Medico gentoo org> AuthorDate: Mon Jun 10 18:16:33 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 10 18:19:09 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c71fa8fa _raise_exc: handle EISDIR Signed-off-by: Zac Medico gentoo.org> lib/portage/util/install_mask.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/portage/util/install_mask.py b/lib/portage/util/install_mask.py index 037fc8bc3..0013effa1 100644 --- a/lib/portage/util/install_mask.py +++ b/lib/portage/util/install_mask.py @@ -12,7 +12,12 @@ import sys from portage import os, _unicode_decode from portage.exception import ( - OperationNotPermitted, PermissionDenied, ReadOnlyFileSystem, FileNotFound) + FileNotFound, + IsADirectory, + OperationNotPermitted, + PermissionDenied, + ReadOnlyFileSystem, +) from portage.util import normalize_path if sys.hexversion >= 0x3000000: @@ -127,6 +132,7 @@ class InstallMask(object): _exc_map = { + errno.EISDIR: IsADirectory, errno.ENOENT: FileNotFound, errno.EPERM: OperationNotPermitted, errno.EACCES: PermissionDenied,