Exclude system.nfs4_acl xattrs, bug #475496

diff --git a/bin/install.py b/bin/install.py
index 02083a18178c850a6bcd6928d6996f1adf50e94d..0bf7a1f89c4f7e2abbf7d54ba72abfc1258df7f5 100755 (executable)
--- a/bin/install.py
+++ b/bin/install.py
@@ -184,7 +184,7 @@ def copy_xattrs(opts, files):
                source, target = files, opts.target_directory
                target_is_directory = True
 
-       exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "security.*")
+       exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "security.* system.nfs4_acl")
 
        try:
                if target_is_directory:

diff --git a/cnf/make.globals b/cnf/make.globals
index 1f07df39ba2695f8da1ca9b5de713aa69a1a3c46..a128029dea6c2159c87676fadabf587201101589 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -127,7 +127,8 @@ PORTAGE_ELOG_MAILFROM="portage@localhost"
 PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
 
 # Security labels are special, see bug #461868.
-PORTAGE_XATTR_EXCLUDE="security.*"
+# system.nfs4_acl attributes are irrelevant, see bug #475496.
+PORTAGE_XATTR_EXCLUDE="security.* system.nfs4_acl"
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index c9159970d8522a6a01db8cf33f6a0d8b1a769147..4ac4535136aaf580497abd09d6dee61f1e3edfc7 100644 (file)
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -321,7 +321,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
                                if xattr_enabled:
                                        try:
                                                _copyxattr(src_bytes, dest_tmp_bytes,
-                                                       exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "security.*"))
+                                                       exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "security.* system.nfs4_acl"))
                                        except SystemExit:
                                                raise
                                        except: