From 74f64397cea77868f0414cbf43f2faf5ce3b81db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Mon, 27 Mar 2006 11:10:37 +0000 Subject: [PATCH] * remove dr only if we got it --- pisi/packagedb.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pisi/packagedb.py b/pisi/packagedb.py index 9f89c788..f0400b29 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -59,7 +59,7 @@ class PackageDB(object): self.dr.destroy() def has_package(self, name, repo=None, txn = None): - return self.d.has_key(name, repo, txn) + return self.d.has_key(name, repo, txn=txn) def get_package(self, name, repo=None, txn = None): try: @@ -117,7 +117,8 @@ class PackageDB(object): def proc(txn): package_info = self.d.get_item(name, repo, txn=txn) self.d.remove_item(name, repo, txn=txn) - self.dr.remove_item(name, repo, txn=txn) + if self.dr.has_item(name, repo, txn=txn): + self.dr.remove_item(name, repo, txn=txn) #WORKAROUND: do not remove component if it is not in repo if type(repo)==types.StringType: ctx.componentdb.remove_package(package_info.partOf, package_info.name, txn) @@ -133,9 +134,9 @@ pkgdb = None def remove_tracking_package(name, txn = None): # remove the guy from the tracking databases - if pkgdb.has_package(name, itembyrepodb.installed, txn): + 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): + if pkgdb.has_package(name, itembyrepodb.thirdparty, txn=txn): pkgdb.remove_package(name, itembyrepodb.thirdparty, txn=txn) def init_db():