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

* fix: update means update if db version insufficient

Browse Source
This commit is contained in:
Eray Özkural
2006-04-10 15:15:09 +00:00
parent 15ba545cb6
commit 433b004d6e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+1 -1
View File
@@ -358,7 +358,7 @@ 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) 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()):
pisi/lockeddbshelve.py
+5 -2
View File
@@ -45,11 +45,14 @@ def check_dbversion(versionfile, ver, write=False, update=False):
ls = verfile.readlines() ls = verfile.readlines()
currver = Version(ls[0]) currver = Version(ls[0])
dbver = Version(ver) dbver = Version(ver)
if currver < dbver and not update: if currver < dbver:
if not update:
raise Error(_('Database version for %s insufficient. Please run rebuild-db command.') % versionfile) raise Error(_('Database version for %s insufficient. Please run rebuild-db command.') % versionfile)
else:
pass # continue to update, then
elif currver > dbver: elif currver > dbver:
raise Error(_('Database version for %s greater than PiSi version. You need a newer PiSi.') % versionfile) raise Error(_('Database version for %s greater than PiSi version. You need a newer PiSi.') % versionfile)
else: elif not update:
return True # db version is OK return True # db version is OK
else: else:
firsttime = True firsttime = True