| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-22 01:41:25 +0000 (Mon, 22 Feb 2010) |
| 3 |
New Revision: 15419 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/FakeVartree.py |
| 7 |
main/trunk/pym/_emerge/PackageVirtualDbapi.py |
| 8 |
main/trunk/pym/_emerge/depgraph.py |
| 9 |
main/trunk/pym/portage/__init__.py |
| 10 |
Log: |
| 11 |
Use lazy import for the portage.dbapi module. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/FakeVartree.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/FakeVartree.py 2010-02-22 01:14:08 UTC (rev 15418) |
| 17 |
+++ main/trunk/pym/_emerge/FakeVartree.py 2010-02-22 01:41:25 UTC (rev 15419) |
| 18 |
@@ -8,11 +8,12 @@ |
| 19 |
from portage import os |
| 20 |
from _emerge.Package import Package |
| 21 |
from _emerge.PackageVirtualDbapi import PackageVirtualDbapi |
| 22 |
+from portage.dbapi.vartree import vartree |
| 23 |
|
| 24 |
if sys.hexversion >= 0x3000000: |
| 25 |
long = int |
| 26 |
|
| 27 |
-class FakeVartree(portage.vartree): |
| 28 |
+class FakeVartree(vartree): |
| 29 |
"""This is implements an in-memory copy of a vartree instance that provides |
| 30 |
all the interfaces required for use by the depgraph. The vardb is locked |
| 31 |
during the constructor call just long enough to read a copy of the |
| 32 |
|
| 33 |
Modified: main/trunk/pym/_emerge/PackageVirtualDbapi.py |
| 34 |
=================================================================== |
| 35 |
--- main/trunk/pym/_emerge/PackageVirtualDbapi.py 2010-02-22 01:14:08 UTC (rev 15418) |
| 36 |
+++ main/trunk/pym/_emerge/PackageVirtualDbapi.py 2010-02-22 01:41:25 UTC (rev 15419) |
| 37 |
@@ -3,9 +3,9 @@ |
| 38 |
# $Id$ |
| 39 |
|
| 40 |
import sys |
| 41 |
-import portage |
| 42 |
+from portage.dbapi import dbapi |
| 43 |
|
| 44 |
-class PackageVirtualDbapi(portage.dbapi): |
| 45 |
+class PackageVirtualDbapi(dbapi): |
| 46 |
""" |
| 47 |
A dbapi-like interface class that represents the state of the installed |
| 48 |
package database as new packages are installed, replacing any packages |
| 49 |
@@ -14,7 +14,7 @@ |
| 50 |
internally (passed in via cpv_inject() and cpv_remove() calls). |
| 51 |
""" |
| 52 |
def __init__(self, settings): |
| 53 |
- portage.dbapi.__init__(self) |
| 54 |
+ dbapi.__init__(self) |
| 55 |
self.settings = settings |
| 56 |
self._match_cache = {} |
| 57 |
self._cp_map = {} |
| 58 |
@@ -80,7 +80,7 @@ |
| 59 |
result = self._match_cache.get(origdep) |
| 60 |
if result is not None: |
| 61 |
return result[:] |
| 62 |
- result = portage.dbapi.match(self, origdep, use_cache=use_cache) |
| 63 |
+ result = dbapi.match(self, origdep, use_cache=use_cache) |
| 64 |
self._match_cache[origdep] = result |
| 65 |
return result[:] |
| 66 |
|
| 67 |
|
| 68 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 69 |
=================================================================== |
| 70 |
--- main/trunk/pym/_emerge/depgraph.py 2010-02-22 01:14:08 UTC (rev 15418) |
| 71 |
+++ main/trunk/pym/_emerge/depgraph.py 2010-02-22 01:41:25 UTC (rev 15419) |
| 72 |
@@ -14,6 +14,7 @@ |
| 73 |
import portage |
| 74 |
from portage import os |
| 75 |
from portage import digraph |
| 76 |
+from portage.dbapi import dbapi |
| 77 |
from portage.dep import Atom |
| 78 |
from portage.output import bold, blue, colorize, create_color_func, darkblue, \ |
| 79 |
darkgreen, green, nc_len, red, teal, turquoise, yellow |
| 80 |
@@ -5236,7 +5237,7 @@ |
| 81 |
def get_runtime_pkg_mask(self): |
| 82 |
return self._dynamic_config._runtime_pkg_mask.copy() |
| 83 |
|
| 84 |
-class _dep_check_composite_db(portage.dbapi): |
| 85 |
+class _dep_check_composite_db(dbapi): |
| 86 |
""" |
| 87 |
A dbapi-like interface that is optimized for use in dep_check() calls. |
| 88 |
This is built on top of the existing depgraph package selection logic. |
| 89 |
@@ -5245,7 +5246,7 @@ |
| 90 |
via dep_check(). |
| 91 |
""" |
| 92 |
def __init__(self, depgraph, root): |
| 93 |
- portage.dbapi.__init__(self) |
| 94 |
+ dbapi.__init__(self) |
| 95 |
self._depgraph = depgraph |
| 96 |
self._root = root |
| 97 |
self._match_cache = {} |
| 98 |
|
| 99 |
Modified: main/trunk/pym/portage/__init__.py |
| 100 |
=================================================================== |
| 101 |
--- main/trunk/pym/portage/__init__.py 2010-02-22 01:14:08 UTC (rev 15418) |
| 102 |
+++ main/trunk/pym/portage/__init__.py 2010-02-22 01:41:25 UTC (rev 15419) |
| 103 |
@@ -83,6 +83,12 @@ |
| 104 |
'portage.data', |
| 105 |
'portage.data:lchown,ostype,portage_gid,portage_uid,secpass,' + \ |
| 106 |
'uid,userland,userpriv_groups,wheelgid', |
| 107 |
+ 'portage.dbapi:dbapi', |
| 108 |
+ 'portage.dbapi.bintree:bindbapi,binarytree', |
| 109 |
+ 'portage.dbapi.porttree:close_portdbapi_caches,FetchlistDict,' + \ |
| 110 |
+ 'portagetree,portdbapi', |
| 111 |
+ 'portage.dbapi.vartree:vardbapi,vartree,dblink', |
| 112 |
+ 'portage.dbapi.virtual:fakedbapi', |
| 113 |
'portage.dep', |
| 114 |
'portage.dep:best_match_to_list,dep_getcpv,dep_getkey,' + \ |
| 115 |
'flatten,get_operator,isjustname,isspecific,isvalidatom,' + \ |
| 116 |
@@ -8766,13 +8772,6 @@ |
| 117 |
] |
| 118 |
auxdbkeylen=len(auxdbkeys) |
| 119 |
|
| 120 |
-from portage.dbapi import dbapi |
| 121 |
-from portage.dbapi.virtual import fakedbapi |
| 122 |
-from portage.dbapi.bintree import bindbapi, binarytree |
| 123 |
-from portage.dbapi.vartree import vardbapi, vartree, dblink |
| 124 |
-from portage.dbapi.porttree import FetchlistDict, \ |
| 125 |
- close_portdbapi_caches, portagetree, portdbapi |
| 126 |
- |
| 127 |
def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, |
| 128 |
vartree=None, prev_mtimes=None, blockers=None): |
| 129 |
"""will merge a .tbz2 file, returning a list of runtime dependencies |
Archives