From 6ef7b0bc75676986a28b8f90adb94f2c5aa49f60 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 30 Aug 2010 10:44:29 -0700 Subject: [PATCH] Add some private constants for use in conditional code in order to minimize the diff between branches. --- pym/portage/const.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pym/portage/const.py b/pym/portage/const.py index fe30efdb5..7edb1f19f 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -114,3 +114,21 @@ MANIFEST2_IDENTIFIERS = ("AUX", "MISC", "DIST", "EBUILD") # =========================================================================== # END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANT # =========================================================================== + +# Private constants for use in conditional code in order to minimize the diff +# between branches. +_ENABLE_DYN_LINK_MAP = True +_ENABLE_PRESERVE_LIBS = True +_ENABLE_SET_CONFIG = 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 not _ENABLE_PRESERVE_LIBS: + SUPPORTED_FEATURES = set(SUPPORTED_FEATURES) + SUPPORTED_FEATURES.remove("preserve-libs") + SUPPORTED_FEATURES = frozenset(SUPPORTED_FEATURES) + +if not _ENABLE_SET_CONFIG: + WORLD_SETS_FILE = '/dev/null' -- 2.26.2