portage.dep._dep_check_strict: Unused, removed

4 files changed, 25 insertions, 51 deletions

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 870d80c4f..8b2a22d8e 100644
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -59,13 +59,9 @@ class BlockerDB(object):
 				# Use aux_get() to trigger FakeVartree global
 				# updates on *DEPEND when appropriate.
 				depstr = " ".join(vardb.aux_get(inst_pkg.cpv, dep_keys))
-				try:
-					portage.dep._dep_check_strict = False
-					success, atoms = portage.dep_check(depstr,
-						vardb, settings, myuse=inst_pkg.use.enabled,
-						trees=dep_check_trees, myroot=inst_pkg.root)
-				finally:
-					portage.dep._dep_check_strict = True
+				success, atoms = portage.dep_check(depstr,
+					vardb, settings, myuse=inst_pkg.use.enabled,
+					trees=dep_check_trees, myroot=inst_pkg.root)
 				if not success:
 					pkg_location = os.path.join(inst_pkg.root,
 						portage.VDB_PATH, inst_pkg.category, inst_pkg.pf)
@@ -98,13 +94,9 @@ class BlockerDB(object):
 
 		# Check for blockers in the other direction.
 		depstr = " ".join(new_pkg.metadata[k] for k in dep_keys)
-		try:
-			portage.dep._dep_check_strict = False
-			success, atoms = portage.dep_check(depstr,
-				vardb, settings, myuse=new_pkg.use.enabled,
-				trees=dep_check_trees, myroot=new_pkg.root)
-		finally:
-			portage.dep._dep_check_strict = True
+		success, atoms = portage.dep_check(depstr,
+			vardb, settings, myuse=new_pkg.use.enabled,
+			trees=dep_check_trees, myroot=new_pkg.root)
 		if not success:
 			# We should never get this far with invalid deps.
 			show_invalid_depstring_notice(new_pkg, depstr, atoms)
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index aeae5e75d..7acc9e11d 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -1088,14 +1088,10 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 				depstr = node.metadata[dep_type]
 				if not depstr:
 					continue
-				try:
-					portage.dep._dep_check_strict = False
-					success, atoms = portage.dep_check(depstr, None, settings,
-						myuse=node_use,
-						trees=resolver._dynamic_config._graph_trees,
-						myroot=myroot)
-				finally:
-					portage.dep._dep_check_strict = True
+				success, atoms = portage.dep_check(depstr, None, settings,
+					myuse=node_use,
+					trees=resolver._dynamic_config._graph_trees,
+					myroot=myroot)
 				if not success:
 					# Ignore invalid deps of packages that will
 					# be uninstalled anyway.
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 10ad5e491..cf090d422 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1192,9 +1192,6 @@ class depgraph(object):
 		debug = "--debug" in self._frozen_config.myopts
 		strict = mytype != "installed"
 		try:
-			if not strict:
-				portage.dep._dep_check_strict = False
-
 			for dep_root, dep_string, dep_priority, ignore_blockers in deps:
 				if not dep_string:
 					continue
@@ -1250,8 +1247,6 @@ class depgraph(object):
 			portage.writemsg("!!! Please notify the package maintainer " + \
 				"that atoms must be fully-qualified.\n", noiselevel=-1)
 			return 0
-		finally:
-			portage.dep._dep_check_strict = True
 		self._dynamic_config._traversed_pkg_deps.add(pkg)
 		return 1
 
@@ -2151,8 +2146,6 @@ class depgraph(object):
 					trees[root]["atom_graph"] = atom_graph
 				if priority is not None:
 					trees[root]["priority"] = priority
-				if not strict:
-					portage.dep._dep_check_strict = False
 				mycheck = portage.dep_check(depstring, None,
 					pkgsettings, myuse=myuse,
 					myroot=root, trees=trees)
@@ -2164,7 +2157,6 @@ class depgraph(object):
 					trees[root].pop("atom_graph")
 				if priority is not None:
 					trees[root].pop("priority")
-				portage.dep._dep_check_strict = True
 			if not mycheck[0]:
 				raise portage.exception.InvalidDependString(mycheck[1])
 		if parent is None:
@@ -3291,24 +3283,20 @@ class depgraph(object):
 						# optimize dep_check calls by eliminating atoms via
 						# dep_wordreduce and dep_eval calls.
 						try:
-							portage.dep._dep_check_strict = False
-							try:
-								success, atoms = portage.dep_check(depstr,
-									final_db, pkgsettings, myuse=self._pkg_use_enabled(pkg),
-									trees=self._dynamic_config._graph_trees, myroot=myroot)
-							except Exception as e:
-								if isinstance(e, SystemExit):
-									raise
-								# This is helpful, for example, if a ValueError
-								# is thrown from cpv_expand due to multiple
-								# matches (this can happen if an atom lacks a
-								# category).
-								show_invalid_depstring_notice(
-									pkg, depstr, str(e))
-								del e
+							success, atoms = portage.dep_check(depstr,
+								final_db, pkgsettings, myuse=self._pkg_use_enabled(pkg),
+								trees=self._dynamic_config._graph_trees, myroot=myroot)
+						except Exception as e:
+							if isinstance(e, SystemExit):
 								raise
-						finally:
-							portage.dep._dep_check_strict = True
+							# This is helpful, for example, if a ValueError
+							# is thrown from cpv_expand due to multiple
+							# matches (this can happen if an atom lacks a
+							# category).
+							show_invalid_depstring_notice(
+								pkg, depstr, str(e))
+							del e
+							raise
 						if not success:
 							replacement_pkg = final_db.match_pkgs(pkg.slot_atom)
 							if replacement_pkg and \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index aa5891f90..f8a8f22e4 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -25,8 +25,6 @@ good = create_color_func("GOOD")
 bad = create_color_func("BAD")
 
 import portage.elog
-import portage.dep
-portage.dep._dep_check_strict = True
 import portage.util
 import portage.locks
 import portage.exception