From 39911c8cb671030beb012bbb9535521578968bda Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 7 Feb 2007 20:34:28 +0000 Subject: [PATCH] For backward compatibility with api consumers, _dep_check_strict behavior will be explicitly enabled as necessary. Thanks to Brian for reporting issues with porthole and equery. (trunk r5907) svn path=/main/branches/2.1.2/; revision=5911 --- bin/ebuild | 2 ++ bin/emerge | 1 + pym/portage_dep.py | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index f5c8d1f69..33bc06c98 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -28,6 +28,8 @@ except ImportError: import portage import portage_util, portage_const +import portage_dep +portage_dep._dep_check_strict = True # do this _after_ 'import portage' to prevent unnecessary tracing if debug and "python-trace" in portage.features: diff --git a/bin/emerge b/bin/emerge index a23a36bee..0256460bb 100755 --- a/bin/emerge +++ b/bin/emerge @@ -41,6 +41,7 @@ good = create_color_func("GOOD") bad = create_color_func("BAD") import portage_dep +portage_dep._dep_check_strict = True import portage_util import portage_locks import portage_exception diff --git a/pym/portage_dep.py b/pym/portage_dep.py index bf40452ac..0b89d9b3e 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -118,8 +118,9 @@ def paren_enclose(mylist): # This is just for use by emerge so that it can enable a backward compatibility # mode in order to gracefully deal with installed packages that have invalid -# atoms or dep syntax. -_dep_check_strict = True +# atoms or dep syntax. For backward compatibility with api consumers, strict +# behavior will be explicitly enabled as necessary. +_dep_check_strict = False def use_reduce(deparray, uselist=[], masklist=[], matchall=0, excludeall=[]): """ -- 2.26.2