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 C3FD1138359 for ; Sun, 22 Nov 2020 06:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2F0BE03EC; Sun, 22 Nov 2020 06:20:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 B2FB2E03EC for ; Sun, 22 Nov 2020 06:20:55 +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 58306340DF6 for ; Sun, 22 Nov 2020 06:20:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9919742C for ; Sun, 22 Nov 2020 06:20:52 +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: <1606025849.a2e7bf7d1c7d518fe8d7cf2c0e6cb30020b8aa94.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/util/_compare_files.py X-VCS-Directories: lib/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a2e7bf7d1c7d518fe8d7cf2c0e6cb30020b8aa94 X-VCS-Branch: master Date: Sun, 22 Nov 2020 06:20:52 +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: 24bcae6e-3a11-452c-8bbf-07d12b9fb8a3 X-Archives-Hash: ec9fcb86cb84c0f790d4722e2a933a9f commit: a2e7bf7d1c7d518fe8d7cf2c0e6cb30020b8aa94 Author: Zac Medico gentoo org> AuthorDate: Sat Nov 21 21:13:27 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Nov 22 06:17:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2e7bf7d compare_files: handle missing xattr support Bug: https://bugs.gentoo.org/755950 Signed-off-by: Zac Medico gentoo.org> lib/portage/util/_compare_files.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/portage/util/_compare_files.py b/lib/portage/util/_compare_files.py index de97a9d9d..60d43aefa 100644 --- a/lib/portage/util/_compare_files.py +++ b/lib/portage/util/_compare_files.py @@ -45,7 +45,8 @@ def compare_files(file1, file2, skipped_types=()): if "device_number" not in skipped_types and file1_stat.st_rdev != file2_stat.st_rdev: differences.append("device_number") - if "xattr" not in skipped_types and sorted(xattr.get_all(file1, nofollow=True)) != sorted(xattr.get_all(file2, nofollow=True)): + if (xattr.XATTRS_WORKS and "xattr" not in skipped_types and + sorted(xattr.get_all(file1, nofollow=True)) != sorted(xattr.get_all(file2, nofollow=True))): differences.append("xattr") if "atime" not in skipped_types and file1_stat.st_atime_ns != file2_stat.st_atime_ns: