From-Import-Removal - not merged?
This commit is contained in:
+7
-8
@@ -29,8 +29,7 @@ import pisi
|
|||||||
import pisi.util as util
|
import pisi.util as util
|
||||||
import pisi.context as ctx
|
import pisi.context as ctx
|
||||||
import pisi.lockeddbshelve as shelve
|
import pisi.lockeddbshelve as shelve
|
||||||
from pisi.itembyrepodb import ItemByRepoDB
|
import pisi.itembyrepodb
|
||||||
import pisi.itembyrepodb as itembyrepodb
|
|
||||||
|
|
||||||
class Error(pisi.Error):
|
class Error(pisi.Error):
|
||||||
pass
|
pass
|
||||||
@@ -45,8 +44,8 @@ class PackageDB(object):
|
|||||||
using shelf objects"""
|
using shelf objects"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.d = ItemByRepoDB('package')
|
self.d = pisi.itembyrepodb.ItemByRepoDB('package')
|
||||||
self.dr = ItemByRepoDB('revdep')
|
self.dr = pisi.itembyrepodb.ItemByRepoDB('revdep')
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
self.d.close()
|
self.d.close()
|
||||||
@@ -145,10 +144,10 @@ pkgdb = None
|
|||||||
|
|
||||||
def remove_tracking_package(name, txn = None):
|
def remove_tracking_package(name, txn = None):
|
||||||
# remove the guy from the tracking databases
|
# remove the guy from the tracking databases
|
||||||
if pkgdb.has_package(name, itembyrepodb.installed, txn=txn):
|
if pkgdb.has_package(name, pisi.itembyrepodb.installed, txn=txn):
|
||||||
pkgdb.remove_package(name, itembyrepodb.installed, txn=txn)
|
pkgdb.remove_package(name, pisi.itembyrepodb.installed, txn=txn)
|
||||||
if pkgdb.has_package(name, itembyrepodb.thirdparty, txn=txn):
|
if pkgdb.has_package(name, pisi.itembyrepodb.thirdparty, txn=txn):
|
||||||
pkgdb.remove_package(name, itembyrepodb.thirdparty, txn=txn)
|
pkgdb.remove_package(name, pisi.itembyrepodb.thirdparty, txn=txn)
|
||||||
|
|
||||||
def init_db():
|
def init_db():
|
||||||
global pkgdb
|
global pkgdb
|
||||||
|
|||||||
Reference in New Issue
Block a user