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 0F0C8138359 for ; Sun, 22 Nov 2020 19:41:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6181FE0815; Sun, 22 Nov 2020 19:41:57 +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 4A43CE0815 for ; Sun, 22 Nov 2020 19:41:57 +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 55451335DB4 for ; Sun, 22 Nov 2020 19:41:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D161B42C for ; Sun, 22 Nov 2020 19:41:54 +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: <1606073931.ae8b18f868c9bd039643f89f28f9d92ce8966c3c.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: ae8b18f868c9bd039643f89f28f9d92ce8966c3c X-VCS-Branch: master Date: Sun, 22 Nov 2020 19:41:54 +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: 9a2898df-832c-414e-a502-b4e13db1e561 X-Archives-Hash: 626fac3437863009a7f1824c9829bd59 commit: ae8b18f868c9bd039643f89f28f9d92ce8966c3c Author: Zac Medico gentoo org> AuthorDate: Sun Nov 22 19:37:05 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Nov 22 19:38:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ae8b18f8 compare_files: fix missing xattr handling Fixes: a2e7bf7d1c7d ("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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/util/_compare_files.py b/lib/portage/util/_compare_files.py index 60d43aefa..7692797fc 100644 --- a/lib/portage/util/_compare_files.py +++ b/lib/portage/util/_compare_files.py @@ -9,7 +9,7 @@ import stat from portage import _encodings from portage import _unicode_encode -from portage.util._xattr import xattr +from portage.util._xattr import XATTRS_WORKS, xattr def compare_files(file1, file2, skipped_types=()): """ @@ -45,7 +45,7 @@ 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.XATTRS_WORKS and "xattr" not in skipped_types and + if (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")