From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1520655-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C109D15806E
for <garchives@archives.gentoo.org>; Tue, 23 May 2023 00:26:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D97B8E0960;
Tue, 23 May 2023 00:26:23 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C1EA7E0960
for <gentoo-commits@lists.gentoo.org>; Tue, 23 May 2023 00:26:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E9619335D59
for <gentoo-commits@lists.gentoo.org>; Tue, 23 May 2023 00:26:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 50905A77
for <gentoo-commits@lists.gentoo.org>; Tue, 23 May 2023 00:26:21 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1684801329.6da3e0fd0ddf5577771cf39b6ac329ee51051a22.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
X-VCS-Repository: proj/portage
X-VCS-Files: lib/portage/dbapi/vartree.py
X-VCS-Directories: lib/portage/dbapi/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6da3e0fd0ddf5577771cf39b6ac329ee51051a22
X-VCS-Branch: master
Date: Tue, 23 May 2023 00:26:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d534ebba-a91c-41e0-8543-b77885a89369
X-Archives-Hash: 88c516a5a47eb451ea8bea63fbfb4e6e
commit: 6da3e0fd0ddf5577771cf39b6ac329ee51051a22
Author: gcarq <egger.m <AT> protonmail <DOT> com>
AuthorDate: Mon Mar 27 13:47:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 00:22:09 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6da3e0fd
mergeme: Put xattr comparison logic behind xattr feature flag
Signed-off-by: gcarq <egger.m <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/dbapi/vartree.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index 676d4aa05..739b47f7f 100644
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@ -6267,9 +6267,10 @@ class dblink:
if mydmode is None or not stat.S_ISREG(mydmode) or mymode != mydmode:
return True
- excluded_xattrs = self.settings.get("PORTAGE_XATTR_EXCLUDE", "")
- if not _cmpxattr(mysrc, mydest, exclude=excluded_xattrs):
- return True
+ if "xattr" in self.settings.features:
+ excluded_xattrs = self.settings.get("PORTAGE_XATTR_EXCLUDE", "")
+ if not _cmpxattr(mysrc, mydest, exclude=excluded_xattrs):
+ return True
return not filecmp.cmp(mysrc, mydest, shallow=False)