[Uludag-commits] r16993 - trunk/pisi

[uludag-commits at pardus.org.tr]

Author: faik
Date: Tue Feb  5 20:35:47 2008
New Revision: 16993

Modified:
   trunk/pisi/pisi-cli
   trunk/pisi/pisi-cli2.5
Log:
merge ekin's bsddb patch from pisi-devel



Modified: trunk/pisi/pisi-cli
=================================================================
--- trunk/pisi/pisi-cli	(original)
+++ trunk/pisi/pisi-cli	Tue Feb  5 20:35:47 2008
@@ -15,7 +15,6 @@
 import traceback
 import exceptions
 import signal
-import bsddb3.db as db
 
 import pisi.ui
 import pisi.context as ctx
@@ -44,10 +43,6 @@
     elif isinstance(value, pisi.Error):
         ui.error(_("Program Terminated."))
         show_traceback = ctx.get_option('debug')
-    elif isinstance(value, db.DBRunRecoveryError):
-        ui.error(_("""A database operation has been aborted. You should run pisi
-again for normal DB recovery procedure. Make sure you have free disk space. 
-You have to run rebuild-db only when there is file corruption and database upgrades."""))
     elif isinstance(value, pisi.Exception):
         show_traceback = True
         ui.error(_("""Unhandled internal exception.

Modified: trunk/pisi/pisi-cli2.5
=================================================================
--- trunk/pisi/pisi-cli2.5	(original)
+++ trunk/pisi/pisi-cli2.5	Tue Feb  5 20:35:47 2008
@@ -15,7 +15,6 @@
 import traceback
 import exceptions
 import signal
-import bsddb3.db as db
 
 import pisi.ui
 import pisi.context as ctx
@@ -39,10 +38,6 @@
     elif isinstance(value, pisi.Error):
         ui.error(_("Program Terminated."))
         show_traceback = ctx.get_option('debug')
-    elif isinstance(value, db.DBRunRecoveryError):
-        ui.error(_("""A database operation has been aborted. You should run pisi
-again for normal DB recovery procedure. Make sure you have free disk space. 
-You have to run rebuild-db only when there is file corruption and database upgrades."""))
     elif isinstance(value, pisi.Exception):
         show_traceback = True
         ui.error(_("""Unhandled internal exception.