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 6A39B139083 for ; Sat, 16 Dec 2017 00:38:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EC88E0E8C; Sat, 16 Dec 2017 00:38:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5BBA2E0E8C for ; Sat, 16 Dec 2017 00:38:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2039233BE18 for ; Sat, 16 Dec 2017 00:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DAAB1AE83 for ; Sat, 16 Dec 2017 00:38:30 +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: <1513384698.dad9cce8a1e2360e8483e0f78e29e20bd5fdce49.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: src/ X-VCS-Repository: proj/portage X-VCS-Files: src/portage_util_file_copy_reflink_linux.c X-VCS-Directories: src/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dad9cce8a1e2360e8483e0f78e29e20bd5fdce49 X-VCS-Branch: master Date: Sat, 16 Dec 2017 00:38:30 +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: 06453dd9-b077-4b68-ae20-4839b3483d82 X-Archives-Hash: 37f088860f077e952ae9e17a56ae9375 commit: dad9cce8a1e2360e8483e0f78e29e20bd5fdce49 Author: Zac Medico gentoo org> AuthorDate: Sat Dec 16 00:37:40 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 16 00:38:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dad9cce8 file_copy: handle EOPNOTSUPP from copy_file_range (bug 641088) NFS can set the errno to EOPNOTSUPP for copy_file_range. Bug: https://bugs.gentoo.org/641088 src/portage_util_file_copy_reflink_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c index 81aae873a..352342c06 100644 --- a/src/portage_util_file_copy_reflink_linux.c +++ b/src/portage_util_file_copy_reflink_linux.c @@ -271,7 +271,7 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args) if (copyfunc_ret < 0) { error = errno; - if ((errno == EXDEV || errno == ENOSYS) && + if ((errno == EXDEV || errno == ENOSYS || errno == EOPNOTSUPP) && copyfunc == cfr_wrapper) { /* Use sendfile instead of copy_file_range for * cross-device copies, or when the copy_file_range