Use rpmtsGet/SetDBMode() to eliminate needs for _RPMTS_INTERNAL

diff --git a/lib/depends.c b/lib/depends.c
index 7a66a25..ebe8715 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -267,8 +267,8 @@ addheader:
        goto exit;
 
     /* Do lazy (readonly?) open of rpm database. */
-    if (rpmtsGetRdb(ts) == NULL && ts->dbmode != -1) {
-       if ((ec = rpmtsOpenDB(ts, ts->dbmode)) != 0)
+    if (rpmtsGetRdb(ts) == NULL && rpmtsGetDBMode(ts) != -1) {
+       if ((ec = rpmtsOpenDB(ts, rpmtsGetDBMode(ts))) != 0)
            goto exit;
     }
 
@@ -1493,8 +1493,8 @@ int rpmtsCheck(rpmts ts)
     (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_CHECK), 0);
 
     /* Do lazy, readonly, open of rpm database. */
-    if (rpmtsGetRdb(ts) == NULL && ts->dbmode != -1) {
-       if ((rc = rpmtsOpenDB(ts, ts->dbmode)) != 0)
+    if (rpmtsGetRdb(ts) == NULL && rpmtsGetDBMode(ts) != -1) {
+       if ((rc = rpmtsOpenDB(ts, rpmtsGetDBMode(ts))) != 0)
            goto exit;
        closeatexit = 1;
     }

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index ca7dfc0..7f3be9c 100644 (file)
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -574,7 +574,7 @@ enditer:
 
        /* XXX installed database needs close here. */
        xx = rpmtsCloseDB(ts);
-       ts->dbmode = -1;        /* XXX disable lazy opens */
+       xx = rpmtsSetDBMode(ts, -1);    /* XXX disable lazy opens */
 
        xx = rpmtsCheck(ts);
 

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index a6f8d8a..aefd038 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -10,7 +10,7 @@
 #include "rpmds.h"
 
 #include "rpmte.h"     /* XXX: rpmts.h needs this for rpmtsScoreEntries */
-#define        _RPMTS_INTERNAL         /* ts->goal, ts->dbmode, ts->suggests */
+#define        _RPMTS_INTERNAL         /* ts->goal, ts->suggests */
 #include "rpmts.h"
 
 #include "manifest.h"

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 756cfbe..b0eaf4d 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -618,14 +618,16 @@ fprintf(stderr, "*** rpmts_Rollback(%p) ts %p\n", s, s->ts);
 static PyObject *
 rpmts_OpenDB(rpmtsObject * s)
 {
+    int dbmode;
 
 if (_rpmts_debug)
 fprintf(stderr, "*** rpmts_OpenDB(%p) ts %p\n", s, s->ts);
 
-    if (s->ts->dbmode == -1)
-       s->ts->dbmode = O_RDONLY;
+    dbmode = rpmtsGetDBMode(s->ts);
+    if (dbmode == -1)
+       dbmode = O_RDONLY;
 
-    return Py_BuildValue("i", rpmtsOpenDB(s->ts, s->ts->dbmode));
+    return Py_BuildValue("i", rpmtsOpenDB(s->ts, dbmode));
 }
 
 /** \ingroup py_c
@@ -639,7 +641,7 @@ if (_rpmts_debug)
 fprintf(stderr, "*** rpmts_CloseDB(%p) ts %p\n", s, s->ts);
 
     rc = rpmtsCloseDB(s->ts);
-    s->ts->dbmode = -1;                /* XXX disable lazy opens */
+    rpmtsSetDBMode(s->ts, -1); /* XXX disable lazy opens */
 
     return Py_BuildValue("i", rc);
 }