summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-07 19:27:50 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-07 19:27:50 +0000
commit93c9a09984d8de32749cb0cd83ff222de2d66134 (patch)
tree8dd3d3946c51d968adca1062f26dae5140a8951d
parent71d15ec4c2e051cc6a38483cc5678b6770f5b082 (diff)
downloadportage-93c9a09984d8de32749cb0cd83ff222de2d66134.tar.gz
portage-93c9a09984d8de32749cb0cd83ff222de2d66134.tar.bz2
portage-93c9a09984d8de32749cb0cd83ff222de2d66134.zip
For backward compatibility with api consumers, _dep_check_strict behavior will be explicitly enabled as necessary. Thanks to Brian <dol-sen@telus.net> for reporting issues with porthole and equery.
svn path=/main/trunk/; revision=5907
-rwxr-xr-xbin/ebuild2
-rwxr-xr-xbin/emerge1
-rw-r--r--pym/portage/dep.py5
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=[]):
"""