diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-26 06:01:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-26 06:01:30 +0000 |
| commit | 8fcfe5cdfb8d4dec3a5dd3f12df562b624321c48 (patch) | |
| tree | 29ee17b8b9d951ad06c8bfa79b6e1341f5524441 | |
| parent | 166d53b931cbfa71fa63d732075737bd0012a90b (diff) | |
| download | portage-8fcfe5cdfb8d4dec3a5dd3f12df562b624321c48.tar.gz portage-8fcfe5cdfb8d4dec3a5dd3f12df562b624321c48.tar.bz2 portage-8fcfe5cdfb8d4dec3a5dd3f12df562b624321c48.zip | |
Use a separate proxy type to trigger portage.portdb initialization separately
from the rest of the legacy global variables. This can be useful since
sometimes the other variables are needed while the portdb is not.
svn path=/main/trunk/; revision=10799
| -rw-r--r-- | pym/portage/__init__.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 54faefad5..bcb2b7afb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6921,6 +6921,20 @@ class _LegacyGlobalProxy(portage.util.ObjectProxy): name = object.__getattribute__(self, '_name') return globals()[name] +class _PortdbProxy(portage.util.ObjectProxy): + """ + The portdb is initialized separately from the rest + of the variables, since sometimes the other variables + are needed while the portdb is not. + """ + + def _get_target(self): + init_legacy_globals() + global db, portdb, root + if portdb is self: + portdb = db[root]["porttree"].dbapi + return portdb + # Initialization of legacy globals. No functions/classes below this point # please! When the above functions and classes become independent of the # below global variables, it will be possible to make the below code @@ -6954,12 +6968,10 @@ def init_legacy_globals(): del _initializing_globals settings = db["/"]["vartree"].settings - portdb = db["/"]["porttree"].dbapi for myroot in db: if myroot != "/": settings = db[myroot]["vartree"].settings - portdb = db[myroot]["porttree"].dbapi break root = settings["ROOT"] @@ -6995,7 +7007,8 @@ def init_legacy_globals(): # use within Portage. External use of this variable is unsupported because # it is experimental and it's behavior is likely to change. if "PORTAGE_LEGACY_GLOBALS" not in os.environ: - for k in ("db", "settings", "root", "portdb", "selinux_enabled", + portdb = _PortdbProxy() + for k in ("db", "settings", "root", "selinux_enabled", "mtimedbfile", "mtimedb", "archlist", "features", "groups", "pkglines", "thirdpartymirrors", "usedefaults", "profiledir", "flushmtimedb"): |