From bd034cadf1df7a5f5f813a6f54f29ea954addf7d Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Tue, 7 Aug 2012 08:43:23 +0200 Subject: [PATCH] euscan: restore reload_gentoolkit() Signed-off-by: Corentin Chary --- pym/euscan/scan.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pym/euscan/scan.py b/pym/euscan/scan.py index cbbd97f..b4b8308 100644 --- a/pym/euscan/scan.py +++ b/pym/euscan/scan.py @@ -70,6 +70,22 @@ def parse_src_uri(uris): return ret +def reload_gentoolkit(): + import gentoolkit + + # Not used in recent versions + if not hasattr(gentoolkit.package, 'PORTDB'): + return + + PORTDB = portage.db[portage.root]["porttree"].dbapi + + if hasattr(gentoolkit.dbapi, 'PORTDB'): + gentoolkit.dbapi.PORTDB = PORTDB + if hasattr(gentoolkit.package, 'PORTDB'): + gentoolkit.package.PORTDB = PORTDB + if hasattr(gentoolkit.query, 'PORTDB'): + gentoolkit.query.PORTDB = PORTDB + def scan_upstream(query, on_progress=None): """ Scans the upstream searching new versions for the given query @@ -78,8 +94,8 @@ def scan_upstream(query, on_progress=None): if query.endswith(".ebuild"): cpv = package_from_ebuild(query) + reload_gentoolkit() if cpv: - reload_gentoolkit() matches = [Package(cpv)] else: matches = Query(query).find(