diff options
| -rw-r--r-- | pym/portage/const.py | 6 | ||||
| -rw-r--r-- | pym/portage/util/movefile.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index bebb92203..5d6aabc0d 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -165,7 +165,6 @@ _ENABLE_DYN_LINK_MAP = True _ENABLE_PRESERVE_LIBS = True _ENABLE_REPO_NAME_WARN = True _ENABLE_SET_CONFIG = True -_ENABLE_XATTR = True # The definitions above will differ between branches, so it's useful to have @@ -178,8 +177,3 @@ 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 9834c5a95..476f8e72a 100644 --- 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, _ENABLE_XATTR +from portage.const import MOVE_BINARY 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 = _ENABLE_XATTR and "xattr" in mysettings.features + xattr_enabled = "xattr" in mysettings.features selinux_enabled = mysettings.selinux_enabled() if selinux_enabled: selinux = _unicode_module_wrapper(_selinux, encoding=encoding) |