| 1 |
commit: 58b14f6f6ee39ffbb1eb5ffdce6e04e911a22d5d |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 1 03:23:14 2012 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Aug 1 03:24:58 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=58b14f6f |
| 7 |
|
| 8 |
replace all use of dbapi's PORTDB, VARDB, BINDB assigned variables with the actuall portage calls to take advantage of all 3 being lazyloaded. The assignemt in dbapi causes all 3 to be loaded, slowing down runs that do not need all 3 |
| 9 |
|
| 10 |
--- |
| 11 |
pym/gentoolkit/dependencies.py | 5 ++--- |
| 12 |
pym/gentoolkit/enalyze/analyze.py | 13 ++++++------- |
| 13 |
pym/gentoolkit/enalyze/lib.py | 7 +++---- |
| 14 |
pym/gentoolkit/enalyze/rebuild.py | 15 +++++++-------- |
| 15 |
pym/gentoolkit/flag.py | 22 ++++++++++------------ |
| 16 |
pym/gentoolkit/helpers.py | 21 +++++++++++---------- |
| 17 |
pym/gentoolkit/package.py | 25 ++++++++++++------------- |
| 18 |
pym/gentoolkit/query.py | 15 +++++++-------- |
| 19 |
8 files changed, 58 insertions(+), 65 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/gentoolkit/dependencies.py b/pym/gentoolkit/dependencies.py |
| 22 |
index 0396952..84e3672 100644 |
| 23 |
--- a/pym/gentoolkit/dependencies.py |
| 24 |
+++ b/pym/gentoolkit/dependencies.py |
| 25 |
@@ -20,7 +20,6 @@ from gentoolkit import errors |
| 26 |
from gentoolkit.atom import Atom |
| 27 |
from gentoolkit.cpv import CPV |
| 28 |
from gentoolkit.helpers import uniqify |
| 29 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 30 |
from gentoolkit.query import Query |
| 31 |
|
| 32 |
# ======= |
| 33 |
@@ -69,10 +68,10 @@ class Dependencies(Query): |
| 34 |
# Try to use the Portage tree first, since emerge only uses the tree |
| 35 |
# when calculating dependencies |
| 36 |
try: |
| 37 |
- result = PORTDB.aux_get(self.cpv, envvars) |
| 38 |
+ result = portage.db[portage.root]["porttree"].dbapi.aux_get(self.cpv, envvars) |
| 39 |
except KeyError: |
| 40 |
try: |
| 41 |
- result = VARDB.aux_get(self.cpv, envvars) |
| 42 |
+ result = portage.db[portage.root]["vartree"].dbapi.aux_get(self.cpv, envvars) |
| 43 |
except KeyError: |
| 44 |
return [] |
| 45 |
return result |
| 46 |
|
| 47 |
diff --git a/pym/gentoolkit/enalyze/analyze.py b/pym/gentoolkit/enalyze/analyze.py |
| 48 |
index 2ba028f..7033422 100644 |
| 49 |
--- a/pym/gentoolkit/enalyze/analyze.py |
| 50 |
+++ b/pym/gentoolkit/enalyze/analyze.py |
| 51 |
@@ -13,7 +13,6 @@ from __future__ import print_function |
| 52 |
import sys |
| 53 |
|
| 54 |
import gentoolkit |
| 55 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 56 |
from gentoolkit.module_base import ModuleBase |
| 57 |
from gentoolkit import pprinter as pp |
| 58 |
from gentoolkit.flag import get_installed_use, get_flags |
| 59 |
@@ -56,7 +55,7 @@ def gather_flags_info( |
| 60 |
@rtype dict. {flag:{"+":[cat/pkg-ver,...], "-":[cat/pkg-ver,...], "unset":[]} |
| 61 |
""" |
| 62 |
if cpvs is None: |
| 63 |
- cpvs = VARDB.cpv_all() |
| 64 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 65 |
# pass them in to override for tests |
| 66 |
flags = FlagAnalyzer(system_flags, |
| 67 |
filter_defaults=False, |
| 68 |
@@ -115,7 +114,7 @@ def gather_keywords_info( |
| 69 |
@rtype dict. {keyword:{"stable":[cat/pkg-ver,...], "testing":[cat/pkg-ver,...]} |
| 70 |
""" |
| 71 |
if cpvs is None: |
| 72 |
- cpvs = VARDB.cpv_all() |
| 73 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 74 |
keyword_users = {} |
| 75 |
for cpv in cpvs: |
| 76 |
if cpv.startswith("virtual"): |
| 77 |
@@ -264,7 +263,7 @@ class Analyse(ModuleBase): |
| 78 |
self.options["verbose"], |
| 79 |
system_use) |
| 80 |
if self.options["verbose"]: |
| 81 |
- cpvs = VARDB.cpv_all() |
| 82 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 83 |
#cpvs = get_installed_cpvs() |
| 84 |
#print "Total number of installed ebuilds =", len(cpvs) |
| 85 |
flag_users = gather_flags_info(cpvs, system_use, |
| 86 |
@@ -324,7 +323,7 @@ class Analyse(ModuleBase): |
| 87 |
"keywords", |
| 88 |
self.options["verbose"], |
| 89 |
system_keywords) |
| 90 |
- self.analyser = KeywordAnalyser( arch, system_keywords, VARDB) |
| 91 |
+ self.analyser = KeywordAnalyser( arch, system_keywords, portage.db[portage.root]["vartree"].dbapi) |
| 92 |
#self.analyser.set_order(portage.settings["USE"].split()) |
| 93 |
# only for testing |
| 94 |
test_use = portage.settings["USE"].split() |
| 95 |
@@ -337,7 +336,7 @@ class Analyse(ModuleBase): |
| 96 |
# /end testing |
| 97 |
|
| 98 |
if self.options["verbose"]: |
| 99 |
- cpvs = VARDB.cpv_all() |
| 100 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 101 |
#print "Total number of installed ebuilds =", len(cpvs) |
| 102 |
keyword_users = gather_keywords_info( |
| 103 |
cpvs=cpvs, |
| 104 |
@@ -398,7 +397,7 @@ class Analyse(ModuleBase): |
| 105 |
""" |
| 106 |
system_use = portage.settings["USE"].split() |
| 107 |
if self.options["verbose"]: |
| 108 |
- cpvs = VARDB.cpv_all() |
| 109 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 110 |
key_width = 45 |
| 111 |
else: |
| 112 |
cpvs = get_installed_cpvs() |
| 113 |
|
| 114 |
diff --git a/pym/gentoolkit/enalyze/lib.py b/pym/gentoolkit/enalyze/lib.py |
| 115 |
index 9dc28a3..de306f0 100644 |
| 116 |
--- a/pym/gentoolkit/enalyze/lib.py |
| 117 |
+++ b/pym/gentoolkit/enalyze/lib.py |
| 118 |
@@ -10,7 +10,6 @@ |
| 119 |
|
| 120 |
import sys |
| 121 |
|
| 122 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 123 |
from gentoolkit import errors |
| 124 |
from gentoolkit.keyword import reduce_keywords |
| 125 |
from gentoolkit.flag import (reduce_flags, get_flags, get_all_cpv_use, |
| 126 |
@@ -158,7 +157,7 @@ class KeywordAnalyser(object): |
| 127 |
@param arch: the system ARCH setting |
| 128 |
@type accept_keywords: list |
| 129 |
@param accept_keywords: eg. ['x86', '~x86'] |
| 130 |
- @type get_aux: function, defaults to: VARDB.aux_get |
| 131 |
+ @type get_aux: function, defaults to: portage.db[portage.root]["vartree"].dbapi.aux_get |
| 132 |
@param vardb: vardb class of functions, needed=aux_get() |
| 133 |
to return => KEYWORDS & USE flags for a cpv |
| 134 |
= aux_get(cpv, ["KEYWORDS", "USE"]) |
| 135 |
@@ -170,7 +169,7 @@ class KeywordAnalyser(object): |
| 136 |
parse_range = list(range(len(normal_order))) |
| 137 |
|
| 138 |
|
| 139 |
- def __init__(self, arch, accept_keywords, vardb=VARDB): |
| 140 |
+ def __init__(self, arch, accept_keywords, vardb=portage.db[portage.root]["vartree"].dbapi): |
| 141 |
self.arch = arch |
| 142 |
self.accept_keywords = accept_keywords |
| 143 |
self.vardb = vardb |
| 144 |
@@ -356,6 +355,6 @@ class KeywordAnalyser(object): |
| 145 |
self.parse_order = self.normal_order |
| 146 |
self.keyword = self.arch |
| 147 |
#print "SET_ORDER() completed: prefix =", self.prefix, ", keyword =", \ |
| 148 |
- # self.keyword, "parse order =",self.parse_order |
| 149 |
+ # self.keyword, "parse order =",self.parse_order |
| 150 |
#print |
| 151 |
|
| 152 |
|
| 153 |
diff --git a/pym/gentoolkit/enalyze/rebuild.py b/pym/gentoolkit/enalyze/rebuild.py |
| 154 |
index d0e1813..cd1a08a 100644 |
| 155 |
--- a/pym/gentoolkit/enalyze/rebuild.py |
| 156 |
+++ b/pym/gentoolkit/enalyze/rebuild.py |
| 157 |
@@ -17,7 +17,6 @@ import os |
| 158 |
import sys |
| 159 |
|
| 160 |
import gentoolkit |
| 161 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 162 |
from gentoolkit.module_base import ModuleBase |
| 163 |
from gentoolkit import pprinter as pp |
| 164 |
from gentoolkit.enalyze.lib import (get_installed_use, get_flags, FlagAnalyzer, |
| 165 |
@@ -55,7 +54,7 @@ def cpv_all_diff_use( |
| 166 |
@rtype dict. {cpv:['flag1', '-flag2',...]} |
| 167 |
""" |
| 168 |
if cpvs is None: |
| 169 |
- cpvs = VARDB.cpv_all() |
| 170 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 171 |
cpvs.sort() |
| 172 |
data = {} |
| 173 |
cp_counts = {} |
| 174 |
@@ -69,7 +68,7 @@ def cpv_all_diff_use( |
| 175 |
for cpv in cpvs: |
| 176 |
plus, minus, unset = flags.analyse_cpv(cpv) |
| 177 |
atom = Atom("="+cpv) |
| 178 |
- atom.slot = VARDB.aux_get(atom.cpv, ["SLOT"])[0] |
| 179 |
+ atom.slot = portage.db[portage.root]["vartree"].dbapi.aux_get(atom.cpv, ["SLOT"])[0] |
| 180 |
for flag in minus: |
| 181 |
plus.add("-"+flag) |
| 182 |
if len(plus): |
| 183 |
@@ -104,7 +103,7 @@ def cpv_all_diff_keywords( |
| 184 |
"testing":[cat/pkg-ver,...]} |
| 185 |
""" |
| 186 |
if cpvs is None: |
| 187 |
- cpvs = VARDB.cpv_all() |
| 188 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 189 |
keyword_users = {} |
| 190 |
cp_counts = {} |
| 191 |
for cpv in cpvs: |
| 192 |
@@ -125,13 +124,13 @@ def cpv_all_diff_keywords( |
| 193 |
cp_counts[atom.cp] = 0 |
| 194 |
if key in ["~"]: |
| 195 |
atom.keyword = keyword |
| 196 |
- atom.slot = VARDB.aux_get(atom.cpv, ["SLOT"])[0] |
| 197 |
+ atom.slot = portage.db[portage.root]["vartree"].dbapi.aux_get(atom.cpv, ["SLOT"])[0] |
| 198 |
keyword_users[atom.cp].append(atom) |
| 199 |
cp_counts[atom.cp] += 1 |
| 200 |
elif key in ["-"]: |
| 201 |
#print "adding cpv to missing:", cpv |
| 202 |
atom.keyword = "**" |
| 203 |
- atom.slot = VARDB.aux_get(atom.cpv, ["SLOT"])[0] |
| 204 |
+ atom.slot = portage.db[portage.root]["vartree"].dbapi.aux_get(atom.cpv, ["SLOT"])[0] |
| 205 |
keyword_users[atom.cp].append(atom) |
| 206 |
cp_counts[atom.cp] += 1 |
| 207 |
return keyword_users, cp_counts |
| 208 |
@@ -283,7 +282,7 @@ class Rebuild(ModuleBase): |
| 209 |
if self.options["verbose"] or self.options["prefix"]: |
| 210 |
print("Current system ARCH =", arch) |
| 211 |
print("Current system ACCEPT_KEYWORDS =", system_keywords) |
| 212 |
- self.analyser = KeywordAnalyser( arch, system_keywords, VARDB) |
| 213 |
+ self.analyser = KeywordAnalyser( arch, system_keywords, portage.db[portage.root]["vartree"].dbapi) |
| 214 |
#self.analyser.set_order(portage.settings["USE"].split()) |
| 215 |
# only for testing |
| 216 |
test_use = portage.settings["USE"].split() |
| 217 |
@@ -295,7 +294,7 @@ class Rebuild(ModuleBase): |
| 218 |
self.analyser.set_order(test_use) |
| 219 |
# /end testing |
| 220 |
|
| 221 |
- cpvs = VARDB.cpv_all() |
| 222 |
+ cpvs = portage.db[portage.root]["vartree"].dbapi.cpv_all() |
| 223 |
#print "Total number of installed ebuilds =", len(cpvs) |
| 224 |
pkgs, cp_counts = cpv_all_diff_keywords( |
| 225 |
cpvs=cpvs, |
| 226 |
|
| 227 |
diff --git a/pym/gentoolkit/flag.py b/pym/gentoolkit/flag.py |
| 228 |
index 0377a81..9983ba7 100644 |
| 229 |
--- a/pym/gentoolkit/flag.py |
| 230 |
+++ b/pym/gentoolkit/flag.py |
| 231 |
@@ -22,8 +22,6 @@ __all__ = ( |
| 232 |
|
| 233 |
import sys |
| 234 |
|
| 235 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 236 |
- |
| 237 |
import portage |
| 238 |
|
| 239 |
|
| 240 |
@@ -38,7 +36,7 @@ def get_iuse(cpv): |
| 241 |
""" |
| 242 |
try: |
| 243 |
# aux_get might return dupes, so run them through set() to remove them |
| 244 |
- return list(set(PORTDB.aux_get(cpv, ["IUSE"])[0].split())) |
| 245 |
+ return list(set(portage.db[portage.root]["porttree"].dbapi.aux_get(cpv, ["IUSE"])[0].split())) |
| 246 |
except: |
| 247 |
return [] |
| 248 |
|
| 249 |
@@ -54,7 +52,7 @@ def get_installed_use(cpv, use="USE"): |
| 250 |
@rtype list |
| 251 |
@returns [] or the list of IUSE flags |
| 252 |
""" |
| 253 |
- return VARDB.aux_get(cpv,[use])[0].split() |
| 254 |
+ return portage.db[portage.root]["vartree"].dbapi.aux_get(cpv,[use])[0].split() |
| 255 |
|
| 256 |
|
| 257 |
def reduce_flag(flag): |
| 258 |
@@ -144,20 +142,20 @@ def get_all_cpv_use(cpv): |
| 259 |
@return use, use_expand_hidden, usemask, useforce |
| 260 |
""" |
| 261 |
use = None |
| 262 |
- PORTDB.settings.unlock() |
| 263 |
+ portage.db[portage.root]["porttree"].dbapi.settings.unlock() |
| 264 |
try: |
| 265 |
- PORTDB.settings.setcpv(cpv, mydb=portage.portdb) |
| 266 |
+ portage.db[portage.root]["porttree"].dbapi.settings.setcpv(cpv, mydb=portage.portdb) |
| 267 |
use = portage.settings['PORTAGE_USE'].split() |
| 268 |
use_expand_hidden = portage.settings["USE_EXPAND_HIDDEN"].split() |
| 269 |
- usemask = list(PORTDB.settings.usemask) |
| 270 |
- useforce = list(PORTDB.settings.useforce) |
| 271 |
+ usemask = list(portage.db[portage.root]["porttree"].dbapi.settings.usemask) |
| 272 |
+ useforce = list(portage.db[portage.root]["porttree"].dbapi.settings.useforce) |
| 273 |
except KeyError: |
| 274 |
- PORTDB.settings.reset() |
| 275 |
- PORTDB.settings.lock() |
| 276 |
+ portage.db[portage.root]["porttree"].dbapi.settings.reset() |
| 277 |
+ portage.db[portage.root]["porttree"].dbapi.settings.lock() |
| 278 |
return [], [], [], [] |
| 279 |
# reset cpv filter |
| 280 |
- PORTDB.settings.reset() |
| 281 |
- PORTDB.settings.lock() |
| 282 |
+ portage.db[portage.root]["porttree"].dbapi.settings.reset() |
| 283 |
+ portage.db[portage.root]["porttree"].dbapi.settings.lock() |
| 284 |
return use, use_expand_hidden, usemask, useforce |
| 285 |
|
| 286 |
|
| 287 |
|
| 288 |
diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py |
| 289 |
index a0b29ab..e7a27ab 100644 |
| 290 |
--- a/pym/gentoolkit/helpers.py |
| 291 |
+++ b/pym/gentoolkit/helpers.py |
| 292 |
@@ -32,11 +32,12 @@ import codecs |
| 293 |
from functools import partial |
| 294 |
from itertools import chain |
| 295 |
|
| 296 |
+import portage |
| 297 |
+ |
| 298 |
from gentoolkit import pprinter as pp |
| 299 |
from gentoolkit import errors |
| 300 |
from gentoolkit.atom import Atom |
| 301 |
from gentoolkit.cpv import CPV |
| 302 |
-from gentoolkit.dbapi import BINDB, PORTDB, VARDB |
| 303 |
from gentoolkit.versionmatch import VersionMatch |
| 304 |
# This has to be imported below to stop circular import. |
| 305 |
#from gentoolkit.package import Package |
| 306 |
@@ -387,11 +388,11 @@ def get_cpvs(predicate=None, include_installed=True): |
| 307 |
""" |
| 308 |
|
| 309 |
if predicate: |
| 310 |
- all_cps = iter(x for x in PORTDB.cp_all() if predicate(x)) |
| 311 |
+ all_cps = iter(x for x in portage.db[portage.root]["porttree"].dbapi.cp_all() if predicate(x)) |
| 312 |
else: |
| 313 |
- all_cps = PORTDB.cp_all() |
| 314 |
+ all_cps = portage.db[portage.root]["porttree"].dbapi.cp_all() |
| 315 |
|
| 316 |
- all_cpvs = chain.from_iterable(PORTDB.cp_list(x) for x in all_cps) |
| 317 |
+ all_cpvs = chain.from_iterable(portage.db[portage.root]["porttree"].dbapi.cp_list(x) for x in all_cps) |
| 318 |
all_installed_cpvs = set(get_installed_cpvs(predicate)) |
| 319 |
|
| 320 |
if include_installed: |
| 321 |
@@ -423,11 +424,11 @@ def get_installed_cpvs(predicate=None): |
| 322 |
""" |
| 323 |
|
| 324 |
if predicate: |
| 325 |
- installed_cps = iter(x for x in VARDB.cp_all() if predicate(x)) |
| 326 |
+ installed_cps = iter(x for x in portage.db[portage.root]["vartree"].dbapi.cp_all() if predicate(x)) |
| 327 |
else: |
| 328 |
- installed_cps = VARDB.cp_all() |
| 329 |
+ installed_cps = portage.db[portage.root]["vartree"].dbapi.cp_all() |
| 330 |
|
| 331 |
- for cpv in chain.from_iterable(VARDB.cp_list(x) for x in installed_cps): |
| 332 |
+ for cpv in chain.from_iterable(portage.db[portage.root]["vartree"].dbapi.cp_list(x) for x in installed_cps): |
| 333 |
yield cpv |
| 334 |
|
| 335 |
|
| 336 |
@@ -442,11 +443,11 @@ def get_bintree_cpvs(predicate=None): |
| 337 |
""" |
| 338 |
|
| 339 |
if predicate: |
| 340 |
- installed_cps = iter(x for x in BINDB.cp_all() if predicate(x)) |
| 341 |
+ installed_cps = iter(x for x in portage.db[portage.root]["bintree"].dbapi.cp_all() if predicate(x)) |
| 342 |
else: |
| 343 |
- installed_cps = BINDB.cp_all() |
| 344 |
+ installed_cps = portage.db[portage.root]["bintree"].dbapi.cp_all() |
| 345 |
|
| 346 |
- for cpv in chain.from_iterable(BINDB.cp_list(x) for x in installed_cps): |
| 347 |
+ for cpv in chain.from_iterable(portage.db[portage.root]["bintree"].dbapi.cp_list(x) for x in installed_cps): |
| 348 |
yield cpv |
| 349 |
|
| 350 |
|
| 351 |
|
| 352 |
diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py |
| 353 |
index cbb7131..f066783 100644 |
| 354 |
--- a/pym/gentoolkit/package.py |
| 355 |
+++ b/pym/gentoolkit/package.py |
| 356 |
@@ -37,7 +37,7 @@ __all__ = ( |
| 357 |
FORMAT_TMPL_VARS = ( |
| 358 |
'$location', '$mask', '$mask2', '$cp', '$cpv', '$category', '$name', |
| 359 |
'$version', '$revision', '$fullversion', '$slot', '$repo', '$keywords' |
| 360 |
-) |
| 361 |
+) |
| 362 |
|
| 363 |
# ======= |
| 364 |
# Imports |
| 365 |
@@ -52,7 +52,6 @@ from portage.util import LazyItemsDict |
| 366 |
import gentoolkit.pprinter as pp |
| 367 |
from gentoolkit import errors |
| 368 |
from gentoolkit.cpv import CPV |
| 369 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 370 |
from gentoolkit.keyword import determine_keyword |
| 371 |
from gentoolkit.flag import get_flags |
| 372 |
from gentoolkit.eprefix import EPREFIX |
| 373 |
@@ -199,23 +198,23 @@ class Package(CPV): |
| 374 |
envvars = (envvars,) |
| 375 |
if prefer_vdb: |
| 376 |
try: |
| 377 |
- result = VARDB.aux_get(self.cpv, envvars) |
| 378 |
+ result = portage.db[portage.root]["vartree"].dbapi.aux_get(self.cpv, envvars) |
| 379 |
except KeyError: |
| 380 |
try: |
| 381 |
if not fallback: |
| 382 |
raise KeyError |
| 383 |
- result = PORTDB.aux_get(self.cpv, envvars) |
| 384 |
+ result = portage.db[portage.root]["porttree"].dbapi.aux_get(self.cpv, envvars) |
| 385 |
except KeyError: |
| 386 |
err = "aux_get returned unexpected results" |
| 387 |
raise errors.GentoolkitFatalError(err) |
| 388 |
else: |
| 389 |
try: |
| 390 |
- result = PORTDB.aux_get(self.cpv, envvars) |
| 391 |
+ result = portage.db[portage.root]["porttree"].dbapi.aux_get(self.cpv, envvars) |
| 392 |
except KeyError: |
| 393 |
try: |
| 394 |
if not fallback: |
| 395 |
raise KeyError |
| 396 |
- result = VARDB.aux_get(self.cpv, envvars) |
| 397 |
+ result = portage.db[portage.root]["vartree"].dbapi.aux_get(self.cpv, envvars) |
| 398 |
except KeyError: |
| 399 |
err = "aux_get returned unexpected results" |
| 400 |
raise errors.GentoolkitFatalError(err) |
| 401 |
@@ -227,7 +226,7 @@ class Package(CPV): |
| 402 |
def exists(self): |
| 403 |
"""Return True if package exists in the Portage tree, else False""" |
| 404 |
|
| 405 |
- return bool(PORTDB.cpv_exists(self.cpv)) |
| 406 |
+ return bool(portage.db[portage.root]["porttree"].dbapi.cpv_exists(self.cpv)) |
| 407 |
|
| 408 |
def settings(self, key): |
| 409 |
"""Returns the value of the given key for this package (useful |
| 410 |
@@ -258,7 +257,7 @@ class Package(CPV): |
| 411 |
try: |
| 412 |
result = portage.getmaskingstatus(self.cpv, |
| 413 |
settings=self._settings, |
| 414 |
- portdb=PORTDB) |
| 415 |
+ portdb=portage.db[portage.root]["porttree"].dbapi) |
| 416 |
except KeyError: |
| 417 |
# getmaskingstatus doesn't support packages without ebuilds in the |
| 418 |
# Portage tree. |
| 419 |
@@ -277,7 +276,7 @@ class Package(CPV): |
| 420 |
try: |
| 421 |
result = portage.getmaskingreason(self.cpv, |
| 422 |
settings=self._settings, |
| 423 |
- portdb=PORTDB, |
| 424 |
+ portdb=portage.db[portage.root]["porttree"].dbapi, |
| 425 |
return_location=True) |
| 426 |
if result is None: |
| 427 |
result = tuple() |
| 428 |
@@ -299,8 +298,8 @@ class Package(CPV): |
| 429 |
""" |
| 430 |
|
| 431 |
if in_vartree: |
| 432 |
- return VARDB.findname(self.cpv) |
| 433 |
- return PORTDB.findname(self.cpv) |
| 434 |
+ return portage.db[portage.root]["vartree"].dbapi.findname(self.cpv) |
| 435 |
+ return portage.db[portage.root]["porttree"].dbapi.findname(self.cpv) |
| 436 |
|
| 437 |
def package_path(self, in_vartree=False): |
| 438 |
"""Return the path to where the ebuilds and other files reside.""" |
| 439 |
@@ -387,7 +386,7 @@ class Package(CPV): |
| 440 |
def is_overlay(self): |
| 441 |
"""Returns True if the package is in an overlay.""" |
| 442 |
|
| 443 |
- ebuild, tree = PORTDB.findname2(self.cpv) |
| 444 |
+ ebuild, tree = portage.db[portage.root]["porttree"].dbapi.findname2(self.cpv) |
| 445 |
if not ebuild: |
| 446 |
return None |
| 447 |
if self._portdir_path is None: |
| 448 |
@@ -400,7 +399,7 @@ class Package(CPV): |
| 449 |
@note: We blindly assume that the package actually exists on disk. |
| 450 |
""" |
| 451 |
|
| 452 |
- unmasked = PORTDB.xmatch("match-visible", self.cpv) |
| 453 |
+ unmasked = portage.db[portage.root]["porttree"].dbapi.xmatch("match-visible", self.cpv) |
| 454 |
return self.cpv not in unmasked |
| 455 |
|
| 456 |
|
| 457 |
|
| 458 |
diff --git a/pym/gentoolkit/query.py b/pym/gentoolkit/query.py |
| 459 |
index 9ad9017..cd8efcc 100644 |
| 460 |
--- a/pym/gentoolkit/query.py |
| 461 |
+++ b/pym/gentoolkit/query.py |
| 462 |
@@ -29,7 +29,6 @@ from gentoolkit import helpers |
| 463 |
from gentoolkit import pprinter as pp |
| 464 |
from gentoolkit.atom import Atom |
| 465 |
from gentoolkit.cpv import CPV |
| 466 |
-from gentoolkit.dbapi import PORTDB, VARDB |
| 467 |
from gentoolkit.package import Package |
| 468 |
from gentoolkit.sets import get_set_atoms, SETPREFIX |
| 469 |
|
| 470 |
@@ -189,11 +188,11 @@ class Query(CPV): |
| 471 |
|
| 472 |
try: |
| 473 |
if include_masked: |
| 474 |
- matches = PORTDB.xmatch("match-all", self.query) |
| 475 |
+ matches = portage.db[portage.root]["porttree"].dbapi.xmatch("match-all", self.query) |
| 476 |
else: |
| 477 |
- matches = PORTDB.match(self.query) |
| 478 |
+ matches = portage.db[portage.root]["porttree"].dbapi.match(self.query) |
| 479 |
if in_installed: |
| 480 |
- matches.extend(VARDB.match(self.query)) |
| 481 |
+ matches.extend(portage.db[portage.root]["vartree"].dbapi.match(self.query)) |
| 482 |
except portage.exception.InvalidAtom as err: |
| 483 |
message = "query.py: find(), query=%s, InvalidAtom=%s" %( |
| 484 |
self.query, str(err)) |
| 485 |
@@ -205,12 +204,12 @@ class Query(CPV): |
| 486 |
"""Return a list of Package objects that matched the search key.""" |
| 487 |
|
| 488 |
try: |
| 489 |
- matches = VARDB.match(self.query) |
| 490 |
+ matches = portage.db[portage.root]["vartree"].dbapi.match(self.query) |
| 491 |
# catch the ambiguous package Exception |
| 492 |
except portage.exception.AmbiguousPackageName as err: |
| 493 |
matches = [] |
| 494 |
for pkgkey in err.args[0]: |
| 495 |
- matches.extend(VARDB.match(pkgkey)) |
| 496 |
+ matches.extend(portage.db[portage.root]["vartree"].dbapi.match(pkgkey)) |
| 497 |
except portage.exception.InvalidAtom as err: |
| 498 |
raise errors.GentoolkitInvalidAtom(err) |
| 499 |
|
| 500 |
@@ -231,7 +230,7 @@ class Query(CPV): |
| 501 |
|
| 502 |
best = keyworded = masked = None |
| 503 |
try: |
| 504 |
- best = PORTDB.xmatch("bestmatch-visible", self.query) |
| 505 |
+ best = portage.db[portage.root]["porttree"].dbapi.xmatch("bestmatch-visible", self.query) |
| 506 |
except portage.exception.InvalidAtom as err: |
| 507 |
message = "query.py: find_best(), bestmatch-visible, " + \ |
| 508 |
"query=%s, InvalidAtom=%s" %(self.query, str(err)) |
| 509 |
@@ -241,7 +240,7 @@ class Query(CPV): |
| 510 |
if not (include_keyworded or include_masked): |
| 511 |
return None |
| 512 |
try: |
| 513 |
- matches = PORTDB.xmatch("match-all", self.query) |
| 514 |
+ matches = portage.db[portage.root]["porttree"].dbapi.xmatch("match-all", self.query) |
| 515 |
except portage.exception.InvalidAtom as err: |
| 516 |
message = "query.py: find_best(), match-all, query=%s, InvalidAtom=%s" %( |
| 517 |
self.query, str(err)) |
Archives