diff options
| author |   gcarq <egger.m@protonmail.com> | 2023-03-27 15:47:52 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-23 01:22:09 +0100 |
| commit | 6da3e0fd0ddf5577771cf39b6ac329ee51051a22 (patch) | |
| tree | 2fafcd6a8c4d0bf66914500622400bcffa3d6e74 | |
| parent | mergeme: Rely on mydmode instead of calling os.path.exists again (diff) | |
| download | portage-6da3e0fd0ddf5577771cf39b6ac329ee51051a22.tar.gz portage-6da3e0fd0ddf5577771cf39b6ac329ee51051a22.tar.bz2 portage-6da3e0fd0ddf5577771cf39b6ac329ee51051a22.zip | |
mergeme: Put xattr comparison logic behind xattr feature flag
Signed-off-by: gcarq <egger.m@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | lib/portage/dbapi/vartree.py | 7 |
1 files 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) |