From-Import-Removal

This commit is contained in:
Faik Uygur
2007-04-27 07:46:38 +00:00
parent b9a955da5e
commit 9eae2deb7f
+7 -9
View File
@@ -26,14 +26,12 @@ import pisi
import pisi.context as ctx import pisi.context as ctx
import pisi.oo import pisi.oo
import pisi.db.lockeddbshelve as dbshelve import pisi.db.lockeddbshelve as dbshelve
from pisi.files import Files import pisi.files
import pisi.util as util import pisi.util
from pisi.util import join_path
class InstallDBError(pisi.Error): class InstallDBError(pisi.Error):
pass pass
class InstallInfo: class InstallInfo:
# some data is replicated from packagedb # some data is replicated from packagedb
# we store as an object, hey, we can waste O(1) space. # we store as an object, hey, we can waste O(1) space.
@@ -75,7 +73,7 @@ class InstallDB:
def __init__(self): def __init__(self):
self.d = dbshelve.LockedDBShelf('install') self.d = dbshelve.LockedDBShelf('install')
self.dp = dbshelve.LockedDBShelf('configpending') self.dp = dbshelve.LockedDBShelf('configpending')
self.files_dir = join_path(ctx.config.db_dir(), 'files') self.files_dir = pisi.util.join_path(ctx.config.db_dir(), 'files')
def close(self): def close(self):
self.d.close() self.d.close()
@@ -83,17 +81,17 @@ class InstallDB:
def files_name(self, pkg, version, release): def files_name(self, pkg, version, release):
pkg_dir = self.pkg_dir(pkg, version, release) pkg_dir = self.pkg_dir(pkg, version, release)
return join_path(pkg_dir, ctx.const.files_xml) return pisi.util.join_path(pkg_dir, ctx.const.files_xml)
def files(self, pkg): def files(self, pkg):
pkg = str(pkg) pkg = str(pkg)
pkginfo = self.d[pkg] pkginfo = self.d[pkg]
files = Files() files = pisi.files.Files()
files.read(self.files_name(pkg,pkginfo.version,pkginfo.release)) files.read(self.files_name(pkg,pkginfo.version,pkginfo.release))
return files return files
def pkg_dir(self, pkg, version, release): def pkg_dir(self, pkg, version, release):
return join_path(ctx.config.lib_dir(), 'package', return pisi.util.join_path(ctx.config.lib_dir(), 'package',
pkg + '-' + version + '-' + release) pkg + '-' + version + '-' + release)
def is_recorded(self, pkg, txn = None): def is_recorded(self, pkg, txn = None):
@@ -167,7 +165,7 @@ class InstallDB:
ctime = time.localtime() ctime = time.localtime()
else: else:
files_xml = self.files_name(pkg, version, release) files_xml = self.files_name(pkg, version, release)
ctime = util.creation_time(files_xml) ctime = pisi.util.creation_time(files_xml)
self.d.put(pkg, InstallInfo(state, version, release, build, distro, ctime), txn) self.d.put(pkg, InstallInfo(state, version, release, build, distro, ctime), txn)