From 25592f9a55effeecb50d6bb1728933c1e6895dfd Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:35:23 +0000 Subject: [PATCH] From-Import-Removal - not merged? --- pisi/packagedb.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pisi/packagedb.py b/pisi/packagedb.py index abc569fd..8f557bd4 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -29,8 +29,7 @@ import pisi import pisi.util as util import pisi.context as ctx import pisi.lockeddbshelve as shelve -from pisi.itembyrepodb import ItemByRepoDB -import pisi.itembyrepodb as itembyrepodb +import pisi.itembyrepodb class Error(pisi.Error): pass @@ -45,8 +44,8 @@ class PackageDB(object): using shelf objects""" def __init__(self): - self.d = ItemByRepoDB('package') - self.dr = ItemByRepoDB('revdep') + self.d = pisi.itembyrepodb.ItemByRepoDB('package') + self.dr = pisi.itembyrepodb.ItemByRepoDB('revdep') def close(self): self.d.close() @@ -145,10 +144,10 @@ pkgdb = None def remove_tracking_package(name, txn = None): # remove the guy from the tracking databases - if pkgdb.has_package(name, itembyrepodb.installed, txn=txn): - pkgdb.remove_package(name, itembyrepodb.installed, txn=txn) - if pkgdb.has_package(name, itembyrepodb.thirdparty, txn=txn): - pkgdb.remove_package(name, itembyrepodb.thirdparty, txn=txn) + if pkgdb.has_package(name, pisi.itembyrepodb.installed, txn=txn): + pkgdb.remove_package(name, pisi.itembyrepodb.installed, txn=txn) + if pkgdb.has_package(name, pisi.itembyrepodb.thirdparty, txn=txn): + pkgdb.remove_package(name, pisi.itembyrepodb.thirdparty, txn=txn) def init_db(): global pkgdb