diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-21 14:19:18 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-21 14:33:18 -0700 |
| commit | 6f065d4911cd72a33e01fa8100d53ed16c6e7e4e (patch) | |
| tree | 97150bd675707a6e99a0ab45d4471266e70ffb08 /pym/portage/const.py | |
| parent | 6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7 (diff) | |
| download | portage-6f065d4911cd72a33e01fa8100d53ed16c6e7e4e.tar.gz portage-6f065d4911cd72a33e01fa8100d53ed16c6e7e4e.tar.bz2 portage-6f065d4911cd72a33e01fa8100d53ed16c6e7e4e.zip | |
Add preserve-libs for stable branch (not default)
EAPI 5 supports automatic rebuilds via the slot-operator and sub-slots,
which makes preserve-libs much more user-friendly, since it makes
@preserved-rebuild unnecessary (also see bug #364425 for explanation of
@preserved-rebuild shortcomings). Therefore, enable preserve-libs for
the stable branch, but not by default. After EAPI 5 is widely adopted,
we can consider enabling preserve-libs by default.
Diffstat (limited to 'pym/portage/const.py')
| -rw-r--r-- | pym/portage/const.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 1e3da36f2..3242861cf 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -99,7 +99,7 @@ SUPPORTED_FEATURES = frozenset([ "metadata-transfer", "mirror", "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip", "notitles", "parallel-fetch", "parallel-install", - "prelink-checksums", + "prelink-checksums", "preserve-libs", "protect-owned", "python-trace", "sandbox", "selinux", "sesandbox", "sfperms", "sign", "skiprocheck", "split-elog", "split-log", "splitdebug", @@ -166,18 +166,7 @@ if "PORTAGE_OVERRIDE_EPREFIX" in os.environ: # Private constants for use in conditional code in order to minimize the diff # between branches. -_ENABLE_DYN_LINK_MAP = True _DEPCLEAN_LIB_CHECK_DEFAULT = True -_ENABLE_PRESERVE_LIBS = True _ENABLE_REPO_NAME_WARN = True _ENABLE_SET_CONFIG = True _ENABLE_INHERIT_CHECK = True - - -# The definitions above will differ between branches, so it's useful to have -# common lines of diff context here in order to avoid merge conflicts. - -if _ENABLE_PRESERVE_LIBS: - SUPPORTED_FEATURES = set(SUPPORTED_FEATURES) - SUPPORTED_FEATURES.add("preserve-libs") - SUPPORTED_FEATURES = frozenset(SUPPORTED_FEATURES) |