From 4b05b2823f9c766387270b3ca79fcbdccdac2577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Tue, 30 May 2006 06:47:00 +0000
Subject: [PATCH] * fix: do fail when we cannot write in read-mode ops

---
 pisi/lockeddbshelve.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pisi/lockeddbshelve.py b/pisi/lockeddbshelve.py
index fe80ec5a..e41e924b 100644
--- a/pisi/lockeddbshelve.py
+++ b/pisi/lockeddbshelve.py
@@ -83,22 +83,22 @@ def init_dbenv(write=False, writeversion=False):
         check_dbversion('filesdbversion', pisi.__filesdbversion__, write=write, update=writeversion)
     else:
         raise Error(_('Cannot attain read access to database environment'))
-    if write and os.access(pisi.context.config.db_dir(), os.W_OK):
-        lock_dbenv()
-        ctx.dbenv = dbobj.DBEnv()
-        flags =  (db.DB_INIT_MPOOL |      # cache
-                  db.DB_INIT_TXN |        # transaction subsystem
-                  db.DB_INIT_LOG |        # logging subsystem
-                  db.DB_RECOVER |         # run normal recovery
-                  db.DB_CREATE)           # allow db to create files
-        ctx.dbenv.set_cachesize(0, 4*1024*1024)
-        ctx.dbenv.open(pisi.context.config.db_dir(), flags)
-        ctx.dbenv.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clear inactive logs automatically
+    if write:
+        if os.access(pisi.context.config.db_dir(), os.W_OK):
+            lock_dbenv()
+            ctx.dbenv = dbobj.DBEnv()
+            flags =  (db.DB_INIT_MPOOL |      # cache
+                      db.DB_INIT_TXN |        # transaction subsystem
+                      db.DB_INIT_LOG |        # logging subsystem
+                      db.DB_RECOVER |         # run normal recovery
+                      db.DB_CREATE)           # allow db to create files
+            ctx.dbenv.set_cachesize(0, 4*1024*1024)
+            ctx.dbenv.open(pisi.context.config.db_dir(), flags)
+            ctx.dbenv.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clear inactive logs automatically
+        else:
+            raise Error(_("Cannot write to PISI database."))
     else:
-        # Warn if not on purpose
-        if write:
-            ctx.ui.warning(_("Opening PISI database in read-only mode. Operations that require write access will fail."))
-        ctx.dbenv = None
+        ctx.dbenv = None # read-only access to database
 
 #def open(filename, flags='r', mode = 0644, filetype = db.DB_BTREE):
 #    db = LockedDBShelf(None, mode, filetype, None, True)