From: Zac Medico Date: Sun, 11 Dec 2011 06:41:01 +0000 (-0800) Subject: Add _ENABLE_XATTR constant for the stable branch. X-Git-Tag: v2.2.0_alpha80~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da0831b24be79e008939f8507f9d457367e533ee;p=portage.git Add _ENABLE_XATTR constant for the stable branch. --- diff --git a/pym/portage/const.py b/pym/portage/const.py index 5c738e431..37abb1650 100644 --- 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 476f8e72a..9834c5a95 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 +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)