| 1 |
commit: df19c66809165cebd9e2f0ca047e1a128a09681c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 4 14:47:48 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 4 14:47:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=df19c668 |
| 7 |
|
| 8 |
Remove portage.const._ENABLE_XATTR. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/const.py | 6 ------ |
| 12 |
pym/portage/util/movefile.py | 4 ++-- |
| 13 |
2 files changed, 2 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 16 |
index bebb922..5d6aabc 100644 |
| 17 |
--- a/pym/portage/const.py |
| 18 |
+++ b/pym/portage/const.py |
| 19 |
@@ -165,7 +165,6 @@ _ENABLE_DYN_LINK_MAP = True |
| 20 |
_ENABLE_PRESERVE_LIBS = True |
| 21 |
_ENABLE_REPO_NAME_WARN = True |
| 22 |
_ENABLE_SET_CONFIG = True |
| 23 |
-_ENABLE_XATTR = True |
| 24 |
|
| 25 |
|
| 26 |
# The definitions above will differ between branches, so it's useful to have |
| 27 |
@@ -178,8 +177,3 @@ if not _ENABLE_PRESERVE_LIBS: |
| 28 |
|
| 29 |
if not _ENABLE_SET_CONFIG: |
| 30 |
WORLD_SETS_FILE = '/dev/null' |
| 31 |
- |
| 32 |
-if not _ENABLE_XATTR: |
| 33 |
- SUPPORTED_FEATURES = set(SUPPORTED_FEATURES) |
| 34 |
- SUPPORTED_FEATURES.remove("xattr") |
| 35 |
- SUPPORTED_FEATURES = frozenset(SUPPORTED_FEATURES) |
| 36 |
|
| 37 |
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py |
| 38 |
index 9834c5a..476f8e7 100644 |
| 39 |
--- a/pym/portage/util/movefile.py |
| 40 |
+++ b/pym/portage/util/movefile.py |
| 41 |
@@ -13,7 +13,7 @@ import portage |
| 42 |
from portage import bsd_chflags, _encodings, _os_overrides, _selinux, \ |
| 43 |
_unicode_decode, _unicode_encode, _unicode_func_wrapper,\ |
| 44 |
_unicode_module_wrapper |
| 45 |
-from portage.const import MOVE_BINARY, _ENABLE_XATTR |
| 46 |
+from portage.const import MOVE_BINARY |
| 47 |
from portage.exception import OperationNotSupported |
| 48 |
from portage.localization import _ |
| 49 |
from portage.process import spawn |
| 50 |
@@ -85,7 +85,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, |
| 51 |
mysettings = portage.settings |
| 52 |
|
| 53 |
src_bytes = _unicode_encode(src, encoding=encoding, errors='strict') |
| 54 |
- xattr_enabled = _ENABLE_XATTR and "xattr" in mysettings.features |
| 55 |
+ xattr_enabled = "xattr" in mysettings.features |
| 56 |
selinux_enabled = mysettings.selinux_enabled() |
| 57 |
if selinux_enabled: |
| 58 |
selinux = _unicode_module_wrapper(_selinux, encoding=encoding) |
Archives