diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-30 10:44:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-30 10:44:29 -0700 |
| commit | 6ef7b0bc75676986a28b8f90adb94f2c5aa49f60 (patch) | |
| tree | f7a143581df66d82fd6e7a5742b55032cf7e7e36 | |
| parent | 2301da7d40e30aa55ca1a77962c3cc17ed921302 (diff) | |
| download | portage-6ef7b0bc75676986a28b8f90adb94f2c5aa49f60.tar.gz portage-6ef7b0bc75676986a28b8f90adb94f2c5aa49f60.tar.bz2 portage-6ef7b0bc75676986a28b8f90adb94f2c5aa49f60.zip | |
Add some private constants for use in conditional code in order to
minimize the diff between branches.
| -rw-r--r-- | pym/portage/const.py | 18 |
1 files changed, 18 insertions, 0 deletions
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' |