Add _ENABLE_XATTR constant for the stable branch.

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 5c738e43125a4a59ebde25331268cdce67ab4056..37abb1650dee0b793152c94f4211b9f5205a959d 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -164,6 +164,7 @@ _ENABLE_DYN_LINK_MAP    = True
 _ENABLE_PRESERVE_LIBS   = True
 _ENABLE_REPO_NAME_WARN  = True
 _ENABLE_SET_CONFIG      = True
+_ENABLE_XATTR           = True
 _SANDBOX_COMPAT_LEVEL   = "22"
 
 
@@ -177,3 +178,8 @@ if not _ENABLE_PRESERVE_LIBS:
 
 if not _ENABLE_SET_CONFIG:
        WORLD_SETS_FILE = '/dev/null'
+
+if not _ENABLE_XATTR:
+       SUPPORTED_FEATURES = set(SUPPORTED_FEATURES)
+       SUPPORTED_FEATURES.remove("xattr")
+       SUPPORTED_FEATURES = frozenset(SUPPORTED_FEATURES)

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 476f8e72adc4fda541c2195ac0c946dc0c4ceecb..9834c5a9507d8d65b9938288a123beebb7b31617 100644 (file)
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -13,7 +13,7 @@ import portage
 from portage import bsd_chflags, _encodings, _os_overrides, _selinux, \
        _unicode_decode, _unicode_encode, _unicode_func_wrapper,\
        _unicode_module_wrapper
-from portage.const import MOVE_BINARY
+from portage.const import MOVE_BINARY, _ENABLE_XATTR
 from portage.exception import OperationNotSupported
 from portage.localization import _
 from portage.process import spawn
@@ -85,7 +85,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
                mysettings = portage.settings
 
        src_bytes = _unicode_encode(src, encoding=encoding, errors='strict')
-       xattr_enabled = "xattr" in mysettings.features
+       xattr_enabled = _ENABLE_XATTR and "xattr" in mysettings.features
        selinux_enabled = mysettings.selinux_enabled()
        if selinux_enabled:
                selinux = _unicode_module_wrapper(_selinux, encoding=encoding)