Add some private constants for use in conditional code in order to

minimize the diff between branches.

diff --git a/pym/portage/const.py b/pym/portage/const.py
index fe30efdb56fcee5588f44be7f7c29cd42ce1d06a..7edb1f19fad6eda476160d4a09ef9085685b464f 100644 (file)
--- 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'