[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/

[Sam James]

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)