commit: a899fee4b565d31c65ad8e458a2acf65f77fcb03
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 21:17:19 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 21:17:19 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a899fee4
Remove redundant PORTAGE_XATTR_EXCLUDE defaults (527636)
In install.py and movefile.py there were some redundant default
PORTAGE_XATTR_EXCLUDE settings. The default settings in make.globals
should be sufficient. Therefore, remove the redundant settings so that
we don't have to maintain them.
Fixes: 2fcdb5f36fac ("Add btrfs.* to default PORTAGE_XATTR_EXCLUDE (527636)")
X-Gentoo-Bug: 527636
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=527636
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
Acked-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
bin/install.py | 2 +-
pym/portage/util/movefile.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/install.py b/bin/install.py
index 3c5e0de..5bbe97b 100755
--- a/bin/install.py
+++ b/bin/install.py
@@ -171,7 +171,7 @@ def copy_xattrs(opts, files):
source, target = files, opts.target_directory
target_is_directory = True
- exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "security.*
system.nfs4_acl")
+ exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "")
try:
if target_is_directory:
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 452e77f..d00f624 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -328,7 +328,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.* system.nfs4_acl"))
+
exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", ""))
except SystemExit:
raise
except:
