Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* twisted import problems

Browse Source
This commit is contained in:
Faik Uygur
2007-04-27 13:09:39 +00:00
parent 0b48824937
commit a413bab458
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+7 -4
View File
@@ -30,7 +30,7 @@ import pisi.packagedb
import pisi.repodb import pisi.repodb
import pisi.installdb import pisi.installdb
import pisi.sourcedb import pisi.sourcedb
import pisi.lockeddbshelve import pisi.lockeddbshelve as shelve
import pisi.index import pisi.index
import pisi.config import pisi.config
import pisi.metadata import pisi.metadata
@@ -41,6 +41,7 @@ import pisi.build
import pisi.atomicoperations import pisi.atomicoperations
import pisi.delta import pisi.delta
import pisi.comariface import pisi.comariface
import pisi.signalhandler
class Error(pisi.Error): class Error(pisi.Error):
pass pass
@@ -88,6 +89,8 @@ def init(database = True, write = True,
if stderr: if stderr:
ctx.stderr = stderr ctx.stderr = stderr
# FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py
import pisi.config
ctx.config = pisi.config.Config(options) ctx.config = pisi.config.Config(options)
if signal_handling: if signal_handling:
@@ -101,7 +104,7 @@ def init(database = True, write = True,
# initialize repository databases # initialize repository databases
ctx.database = database ctx.database = database
if database: if database:
pisi.lockeddbshelve.init_dbenv(write=write) shelve.init_dbenv(write=write)
ctx.repodb = pisi.repodb.init() ctx.repodb = pisi.repodb.init()
ctx.installdb = pisi.installdb.init() ctx.installdb = pisi.installdb.init()
ctx.filesdb = pisi.files.FilesDB() ctx.filesdb = pisi.files.FilesDB()
@@ -519,12 +522,12 @@ def rebuild_db(files=False):
# check db schema versions # check db schema versions
try: try:
pisi.lockeddbshelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) shelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False)
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except Exception, e: #FIXME: what exception could we catch here, replace with that. except Exception, e: #FIXME: what exception could we catch here, replace with that.
files = True # exception means the files db version was wrong files = True # exception means the files db version was wrong
pisi.lockeddbshelve.init_dbenv(write=True, writeversion=True) shelve.init_dbenv(write=True, writeversion=True)
destroy(files) # bye bye destroy(files) # bye bye
# save parameters and shutdown pisi # save parameters and shutdown pisi