For backward compatibility with api consumers, _dep_check_strict behavior will be...

svn path=/main/branches/2.1.2/; revision=5911

diff --git a/bin/ebuild b/bin/ebuild
index f5c8d1f699d07fc79be0ba1194cf94ca4cfe0d41..33bc06c983d3407db3a542d77ecfe3b01643dcee 100755 (executable)
--- 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 a23a36bee9014b85d95bf6fefad5ab876aa29e1b..0256460bb11a51a5491a225779dabdb89714e4f6 100755 (executable)
--- 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 bf40452ac6c5158a54361e56fa198cd96c4430b9..0b89d9b3e554d5a89a21b4e8700903b3eef7d72e 100644 (file)
--- 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=[]):
        """