[Uludag-commits] r15242 - branches/pisi-db/pisi

[uludag-commits at pardus.org.tr]

Author: faik
Date: Sat Sep  1 14:33:59 2007
New Revision: 15242

Modified:
   branches/pisi-db/pisi/api.py
   branches/pisi-db/pisi/atomicoperations.py
   branches/pisi-db/pisi/context.py
Log:
Remove bsddb imports


Modified: branches/pisi-db/pisi/api.py
=================================================================
--- branches/pisi-db/pisi/api.py	(original)
+++ branches/pisi-db/pisi/api.py	Sat Sep  1 14:33:59 2007
@@ -472,20 +472,6 @@
         for pkg in replica:
             pisi.util.clean_dir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package', pkg))
 
-    def destroy(files):
-        #TODO: either don't delete version files here, or remove force flag...
-        import bsddb3.db
-        for db in os.listdir(ctx.config.db_dir()):
-            if db.endswith('.bdb'):# or db.startswith('log'):  # delete only db files
-                if db.startswith('files') or db.startswith('filesdbversion'):
-                    clean = files
-                else:
-                    clean = True
-                if clean:
-                    fn = pisi.util.join_path(ctx.config.db_dir(), db)
-                    #NB: there is a parameter bug with python-bsddb3, fixed in pardus
-                    #ctx.dbenv.dbremove(file=fn, flags=bsddb3.db.DB_AUTO_COMMIT)
-
     def reload_packages(files):
         packages = os.listdir(pisi.util.join_path(ctx.config.lib_dir(), 'package'))
         progress = ctx.ui.Progress(len(packages))
@@ -516,7 +502,6 @@
     except Exception: #FIXME: what exception could we catch here, replace with that.
         files = True # exception means the files db version was wrong
     shelve.init_dbenv(write=True, writeversion=True)
-    destroy(files) # bye bye
 
     # save parameters and shutdown pisi
     options = ctx.config.options

Modified: branches/pisi-db/pisi/atomicoperations.py
=================================================================
--- branches/pisi-db/pisi/atomicoperations.py	(original)
+++ branches/pisi-db/pisi/atomicoperations.py	Sat Sep  1 14:33:59 2007
@@ -16,7 +16,6 @@
 _ = __trans.ugettext
 
 import os
-import bsddb3.db as db
 import shutil
 
 import pisi

Modified: branches/pisi-db/pisi/context.py
=================================================================
--- branches/pisi-db/pisi/context.py	(original)
+++ branches/pisi-db/pisi/context.py	Sat Sep  1 14:33:59 2007
@@ -61,8 +61,6 @@
 #    """ Register a UI implementation"""
 #    ui = _impl
 
-import bsddb3.db as db
-
 def disable_keyboard_interrupts():
     sig and sig.disable_signal(signal.SIGINT)