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

* fix: raise error when dbversion not present and in read mode

Browse Source 
* fix: do not try to init dbenv unnecessarily
This commit is contained in:
Eray Özkural
2006-03-23 11:38:02 +00:00
parent 806cf46690
commit ccbcf5d165
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+1 -1
View File
@@ -336,9 +336,9 @@ def rebuild_db(files=False):
def destroy(files): def destroy(files):
#from pisi.lockeddbshelve import LockedDBShelf #from pisi.lockeddbshelve import LockedDBShelf
#pisi.lockeddbshelve.init_dbenv(write=True)
#TODO: either don't delete version files here, or remove force flag... #TODO: either don't delete version files here, or remove force flag...
import bsddb3.db import bsddb3.db
pisi.lockeddbshelve.init_dbenv(write=True)
for db in os.listdir(ctx.config.db_dir()): for db in os.listdir(ctx.config.db_dir()):
if db.endswith('.bdb') or db.startswith('log'): # delete only db files if db.endswith('.bdb') or db.startswith('log'): # delete only db files
if db.startswith('files') or db.startswith('filesdbversion'): if db.startswith('files') or db.startswith('filesdbversion'):
pisi/lockeddbshelve.py
+3 -1
View File
@@ -54,12 +54,14 @@ def check_dbversion(versionfile, ver, write=False, force=False):
return True # return if force not set and db version ok return True # return if force not set and db version ok
if write: if write:
if os.access(pisi.context.config.db_dir(), os.W_OK): if os.access(pisi.context.config.db_dir(), os.W_OK):
ctx.ui.warning(_('Writing current database version')) ctx.ui.warning(_('Writing current database version for %s') % versionfile)
verfile = file(verfn, 'w') verfile = file(verfn, 'w')
verfile.write(ver) verfile.write(ver)
verfile.close() verfile.close()
else: else:
raise Error(_('Cannot attain write access to database environment')) raise Error(_('Cannot attain write access to database environment'))
else:
raise Error(_('Database version %s not present.') % versionfile)
def init_dbenv(write=False, writeversion=False): def init_dbenv(write=False, writeversion=False):
if os.access(pisi.context.config.db_dir(), os.R_OK): if os.access(pisi.context.config.db_dir(), os.R_OK):