From bb6d80badd962b97e4470b36b6970ac4aadb76d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20D=2E=20Ak=C4=B1n?= Date: Fri, 9 Mar 2007 20:21:04 +0000 Subject: [PATCH] Be consistent, always use ctx. ctx will die too. soon. --- pisi/api.py | 8 ++++++-- pisi/atomicoperations.py | 2 +- pisi/dependency.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 359f3946..172ad25b 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -134,8 +134,12 @@ def finalize(): ctx.loghandler.flush() ctx.log.removeHandler(ctx.loghandler) - pisi.db.repodb.finalize() - pisi.db.installdb.finalize() + if ctx.repodb: + ctx.repodb.finalize() + ctx.repodb = None + if ctx.installdb: + ctx.installdb.finalize() + ctx.installdb = None if ctx.filesdb != None: ctx.filesdb.close() ctx.filesdb = None diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index f4bd0f24..92fa7321 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -525,7 +525,7 @@ class Remove(AtomicOperation): def remove_db(self, txn): ctx.installdb.remove(self.package_name, txn) ctx.filesdb.remove_files(self.files, txn) - pisi.db.packagedb.remove_tracking_package(self.package_name, txn) + ctx.packagedb.remove_tracking_package(self.package_name, txn) def remove_single(package_name): diff --git a/pisi/dependency.py b/pisi/dependency.py index 88b31080..ae124ab2 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -17,7 +17,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi.context as ctx -#import pisi.db.packagedb as packagedb +import pisi.db.packagedb as packagedb from pisi.version import Version import pisi.pxml.autoxml as autoxml import pisi.db.itembyrepodb