From 93c9a09984d8de32749cb0cd83ff222de2d66134 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 7 Feb 2007 19:27:50 +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. svn path=/main/trunk/; revision=5907 --- 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 bcf324873..20254e007 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 e37f4bb6d..21bcbf7bc 100755 --- a/bin/emerge +++ b/bin/emerge @@ -42,6 +42,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 e82942e47..6b38e8eed 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