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

* fix: don't write db version twice, and remove redundant stuff

Browse Source
This commit is contained in:
Eray Özkural
2006-06-07 12:30:01 +00:00
parent 0d5334da82
commit eb70d4598e
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+2 -8
View File
@@ -438,8 +438,6 @@ def rebuild_db(files=False):
pisi.util.clean_dir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package', pkg)) pisi.util.clean_dir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package', pkg))
def destroy(files): def destroy(files):
#from pisi.lockeddbshelve import LockedDBShelf
pisi.lockeddbshelve.init_dbenv(write=True, writeversion=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
for db in os.listdir(ctx.config.db_dir()): for db in os.listdir(ctx.config.db_dir()):
@@ -450,11 +448,8 @@ def rebuild_db(files=False):
clean = True clean = True
if clean: if clean:
fn = pisi.util.join_path(ctx.config.db_dir(), db) fn = pisi.util.join_path(ctx.config.db_dir(), db)
#FIXME: there is a bug with bsddb3 #NB: there is a parameter bug with python-bsddb3, fixed in pardus
#ctx.dbenv.dbremove(fn, "", None, bsddb3.db.DB_AUTO_COMMIT)
ctx.dbenv.dbremove(file=fn, flags=bsddb3.db.DB_AUTO_COMMIT) ctx.dbenv.dbremove(file=fn, flags=bsddb3.db.DB_AUTO_COMMIT)
#os.unlink(fn)
ctx.dbenv.close()
def reload_packages(files, txn): def reload_packages(files, txn):
for package_fn in os.listdir( pisi.util.join_path( ctx.config.lib_dir(), for package_fn in os.listdir( pisi.util.join_path( ctx.config.lib_dir(),
@@ -477,9 +472,8 @@ def rebuild_db(files=False):
pisi.lockeddbshelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) pisi.lockeddbshelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False)
except: except:
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)
destroy(files) # bye bye destroy(files) # bye bye
pisi.lockeddbshelve.check_dbversion('dbversion', pisi.__dbversion__, write=True, update=True)
pisi.lockeddbshelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=True, update=True)
# save parameters and shutdown pisi # save parameters and shutdown pisi
options = ctx.config.options options = ctx.config.options