diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-10 21:23:25 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-10 22:28:57 -0700 |
| commit | e6f50ba776c110a12c47148de5f5799ef8f49479 (patch) | |
| tree | eda1750aa84168d623679a95273cc569af71b26d /pym/_emerge/BlockerDB.py | |
| parent | 047f52b5d439573cc673a189096ba33c1817b882 (diff) | |
| download | portage-e6f50ba776c110a12c47148de5f5799ef8f49479.tar.gz portage-e6f50ba776c110a12c47148de5f5799ef8f49479.tar.bz2 portage-e6f50ba776c110a12c47148de5f5799ef8f49479.zip | |
portage.dep._dep_check_strict: Unused, removed
Diffstat (limited to 'pym/_emerge/BlockerDB.py')
| -rw-r--r-- | pym/_emerge/BlockerDB.py | 20 |
1 files changed, 6 insertions, 14 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) |