| 1 |
In install.py and movefile.py there were some redundant default |
| 2 |
PORTAGE_XATTR_EXCLUDE settings. The default settings in make.globals |
| 3 |
should be sufficient. Therefore, remove the redundant settings so that |
| 4 |
we don't have to maintain them. |
| 5 |
|
| 6 |
Fixes: 2fcdb5f36fac ("Add btrfs.* to default PORTAGE_XATTR_EXCLUDE (527636)") |
| 7 |
X-Gentoo-Bug: 527636 |
| 8 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=527636 |
| 9 |
Acked-by: Brian Dolbec <dolsen@g.o> |
| 10 |
Acked-by: Anthony G. Basile <blueness@g.o> |
| 11 |
--- |
| 12 |
bin/install.py | 2 +- |
| 13 |
pym/portage/util/movefile.py | 2 +- |
| 14 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/install.py b/bin/install.py |
| 17 |
index 3c5e0de..5bbe97b 100755 |
| 18 |
--- a/bin/install.py |
| 19 |
+++ b/bin/install.py |
| 20 |
@@ -171,7 +171,7 @@ def copy_xattrs(opts, files): |
| 21 |
source, target = files, opts.target_directory |
| 22 |
target_is_directory = True |
| 23 |
|
| 24 |
- exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "security.* system.nfs4_acl") |
| 25 |
+ exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "") |
| 26 |
|
| 27 |
try: |
| 28 |
if target_is_directory: |
| 29 |
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py |
| 30 |
index 452e77f..d00f624 100644 |
| 31 |
--- a/pym/portage/util/movefile.py |
| 32 |
+++ b/pym/portage/util/movefile.py |
| 33 |
@@ -328,7 +328,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, |
| 34 |
if xattr_enabled: |
| 35 |
try: |
| 36 |
_copyxattr(src_bytes, dest_tmp_bytes, |
| 37 |
- exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "security.* system.nfs4_acl")) |
| 38 |
+ exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "")) |
| 39 |
except SystemExit: |
| 40 |
raise |
| 41 |
except: |
| 42 |
-- |
| 43 |
2.0.4 |
Archives