[gentoo-commits] proj/portage:master commit in: pym/portage/, pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     a574fd9e6f81a0a072cbaf34c6bd45ad7942cc94
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 18:40:20 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 18:40:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a574fd9e

Add _DEPCLEAN_LIB_CHECK_DEFAULT constant.

This will allow for the option to be available in the stable branch
without changing the default --depclean behavior.

---
 pym/_emerge/actions.py |    4 ++--
 pym/portage/const.py   |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 9a023a8..8e75dad 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -31,7 +31,7 @@ from portage import shutil
 from portage import eapi_is_supported, _unicode_decode
 from portage.cache.cache_errors import CacheError
 from portage.const import GLOBAL_CONFIG_PATH
-from portage.const import _ENABLE_DYN_LINK_MAP
+from portage.const import _ENABLE_DYN_LINK_MAP, _DEPCLEAN_LIB_CHECK_DEFAULT
 from portage.dbapi.dep_expand import dep_expand
 from portage.dbapi._expand_new_virt import expand_new_virt
 from portage.dep import Atom
@@ -941,7 +941,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 
 	if cleanlist and \
 		real_vardb._linkmap is not None and \
-		myopts.get("--depclean-lib-check") != "n" and \
+		myopts.get("--depclean-lib-check", _DEPCLEAN_LIB_CHECK_DEFAULT) != "n" and \
 		"preserve-libs" not in settings.features:
 
 		# Check if any of these packages are the sole providers of libraries

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 49a14d3..1e3da36 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -167,6 +167,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