| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-08 08:41:31 +0000 (Thu, 08 May 2008) |
| 3 |
New Revision: 10228 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix namespace breakage. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-05-08 08:18:10 UTC (rev 10227) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-05-08 08:41:31 UTC (rev 10228) |
| 15 |
@@ -1715,12 +1715,12 @@ |
| 16 |
# updates on *DEPEND when appropriate. |
| 17 |
depstr = " ".join(vardb.aux_get(inst_pkg.cpv, dep_keys)) |
| 18 |
try: |
| 19 |
- portage.dep._dep_check_strict = False |
| 20 |
+ portage_dep._dep_check_strict = False |
| 21 |
success, atoms = portage.dep_check(depstr, |
| 22 |
vardb, settings, myuse=myuse, |
| 23 |
trees=dep_check_trees, myroot=inst_pkg.root) |
| 24 |
finally: |
| 25 |
- portage.dep._dep_check_strict = True |
| 26 |
+ portage_dep._dep_check_strict = True |
| 27 |
if not success: |
| 28 |
pkg_location = os.path.join(inst_pkg.root, |
| 29 |
portage.VDB_PATH, inst_pkg.category, inst_pkg.pf) |
| 30 |
|
| 31 |
-- |
| 32 |
gentoo-commits@l.g.o mailing list |
Archives