From 4ddeacea98c15971264056972cd6d03631c73aca Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 4 Apr 2020 14:21:50 -0400
Subject: dev-lang/python: ignore EACCES instead of EPERM

Fixes: 212bc8ce91237d28de326e84ff8607863602d1f7
Closes: https://bugs.gentoo.org/679628
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 .../files/test.support.unlink-ignore-EACCES.patch  | 28 ++++++++++++++++++++++
 .../files/test.support.unlink-ignore-EPERM.patch   | 28 ----------------------
 dev-lang/python/python-2.7.17-r2.ebuild            |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
 delete mode 100644 dev-lang/python/files/test.support.unlink-ignore-EPERM.patch

(limited to 'dev-lang/python')

diff --git a/dev-lang/python/files/test.support.unlink-ignore-EACCES.patch b/dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
new file mode 100644
index 000000000000..865a914b4100
--- /dev/null
+++ b/dev-lang/python/files/test.support.unlink-ignore-EACCES.patch
@@ -0,0 +1,28 @@
+From b8dc49c87f29fa875bd24fe47c741d11962a33b6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 4 Apr 2020 14:11:25 -0400
+Subject: [PATCH] test.support.unlink: ignore EACCES
+
+Resolves test errors when running in the Gentoo sandbox environment.
+
+Bug: https://bugs.gentoo.org/679628
+---
+ Lib/test/support/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index ccc11c1b4b0..d47bdebda5c 100644
+--- a/Lib/test/support/__init__.py
++++ b/Lib/test/support/__init__.py
+@@ -291,7 +291,7 @@ def unlink(filename):
+     try:
+         _unlink(filename)
+     except OSError as exc:
+-        if exc.errno not in (errno.ENOENT, errno.ENOTDIR):
++        if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EACCES):
+             raise
+ 
+ def rmdir(dirname):
+-- 
+2.26.0
+
diff --git a/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch b/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
deleted file mode 100644
index 291398137c7b..000000000000
--- a/dev-lang/python/files/test.support.unlink-ignore-EPERM.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 789c61e1a1966241d274012cdbd5fb9716448952 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 3 Apr 2020 10:37:56 -0400
-Subject: [PATCH] test.support.unlink: ignore EPERM
-
-Resolves test errors when running in the Gentoo sandbox environment.
-
-Bug: https://bugs.gentoo.org/679628
----
- Lib/test/support/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index ccc11c1b4b0..c5ec06bb420 100644
---- a/Lib/test/support/__init__.py
-+++ b/Lib/test/support/__init__.py
-@@ -291,7 +291,7 @@ def unlink(filename):
-     try:
-         _unlink(filename)
-     except OSError as exc:
--        if exc.errno not in (errno.ENOENT, errno.ENOTDIR):
-+        if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EPERM):
-             raise
- 
- def rmdir(dirname):
--- 
-2.26.0
-
diff --git a/dev-lang/python/python-2.7.17-r2.ebuild b/dev-lang/python/python-2.7.17-r2.ebuild
index c38022f956b5..7cb8c9b155e4 100644
--- a/dev-lang/python/python-2.7.17-r2.ebuild
+++ b/dev-lang/python/python-2.7.17-r2.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/${PATCHSET}"
-		"${FILESDIR}/test.support.unlink-ignore-EPERM.patch"
+		"${FILESDIR}/test.support.unlink-ignore-EACCES.patch"
 	)
 
 	default
-- 
cgit v1.2.3-65-gdbad