From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 Jul 2013 19:50:57 +0000 (-0700)
Subject: Exclude system.nfs4_acl xattrs, bug #475496
X-Git-Tag: v2.2.0_alpha189~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0645806fc61db76498c9ec8ccd4ba54d71eeb6a;p=portage.git

Exclude system.nfs4_acl xattrs, bug #475496
---

diff --git a/bin/install.py b/bin/install.py
index 02083a181..0bf7a1f89 100755
--- 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 1f07df39b..a128029de 100644
--- 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 c9159970d..4ac453513 100644
--- 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: