Don't incrementally link pthreads, causes segfault on (at least) alpha.

db0.c: Simulate db->sync on falloc.
db0.c: Use RPMDBI_PACKAGES for rpmtag comparisons.
db0.c: Add debug for dbi open/close like db3.
db0.c: Remove dbi if temporary (i.e. Depends).
db3.c: Filter DB_INCOMPLETE from db->sync return, it's usually harmless.
depends.c: Free Depends iterator, pass keylen, and use cursors.
depends.c: Free iterator *after* loop, not at end of 1st pass.
rpmdb.c: Fine grained cursor locks to avoid "crossed cursors" deadlocks.
rpmdb.c: Lazy open/close during rpmdbAdd/rpmdbRemove/openDatabase.
rpmdb.c: Remove last remnants of dbix, do dynamic lookup instead.
rpmdb.c: Resurrect rpmdbUpdateRecord in iterator loop.
macros.in: Add Depends dbi to config.
macros.in: Configure "nommap:mp_size=2Mb:pagesize=16Kb".

CVS patchset: 3707
CVS date: 2000/04/28 15:14:47

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4583365..776d295 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,7 +35,7 @@ falloc.lo: falloc.c $(top_srcdir)/system.h rpmio.h falloc.h
 db3.lo: db3.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
        $(LIBTOOL) --mode=compile $(COMPILE) -c $<
        for F in $*.o $*.lo ; do \
-           @__LD@ -r -o $${F}.o $${F} -L/usr/lib -ldb-3.0 -lpthread ; \
+           @__LD@ -r -o $${F}.o $${F} -L/usr/lib -ldb-3.0 ; \
            @__OBJCOPY@ `\
                @__NM@ -g --defined-only $${F}.o | \
                sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \

diff --git a/lib/db0.c b/lib/db0.c
index 1dc8f1d..9abebed 100644 (file)
--- a/lib/db0.c
+++ b/lib/db0.c
@@ -80,9 +80,16 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) {
 
 static int db0sync(dbiIndex dbi, unsigned int flags) {
     DB * db = GetDB(dbi);
-    int rc;
+    int rc = 0;
+
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
+       int fdno = Fileno(dbi->dbi_pkgs);
+       if (fdno >= 0)
+           rc = fsync(fdno);
+    }
 
-    rc = db->sync(db, flags);
+    if (db)
+       rc = db->sync(db, flags);
 
     switch (rc) {
     default:
@@ -198,7 +205,7 @@ static int db0cget(dbiIndex dbi, void ** keyp, size_t * keylen,
     if (datap)         data.data = *datap;
     if (datalen)       data.size = *datalen;
 
-    if (dbi->dbi_rpmtag == 0) {
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
        unsigned int offset;
        unsigned int newSize;
 
@@ -274,7 +281,7 @@ static int db0cdel(dbiIndex dbi, const void * keyp, size_t keylen,
 {
     int rc = 0;
 
-    if (dbi->dbi_rpmtag == 0) {
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
        unsigned int offset;
        memcpy(&offset, keyp, sizeof(offset));
        fadFree(dbi->dbi_pkgs, offset);
@@ -307,7 +314,7 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
     data.data = (void *)datap;
     data.size = datalen;
 
-    if (dbi->dbi_rpmtag == 0) {
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
        unsigned int offset;
 
        memcpy(&offset, key.data, sizeof(offset));
@@ -331,6 +338,7 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
        }
     } else {
        DB * db = GetDB(dbi);
+       int xx;
 
        rc = db->put(db, &key, &data, 0);
        rc = cvtdberr(dbi, "db->put", rc, _debug);
@@ -341,15 +349,19 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
 
 static int db0close(dbiIndex dbi, unsigned int flags) {
     DB * db = GetDB(dbi);
+    rpmdb rpmdb = dbi->dbi_rpmdb;
+    const char * base = db0basename(dbi->dbi_rpmtag);
+    const char * urlfn = rpmGenPath(rpmdb->db_root, rpmdb->db_home, base);
+    const char * fn;
     int rc = 0;
 
-    if (dbi->dbi_rpmtag == 0) {
+    (void) urlPath(urlfn, &fn);
+
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
        FD_t pkgs;
        if ((pkgs = dbi->dbi_pkgs) != NULL)
            Fclose(pkgs);
        dbi->dbi_pkgs = NULL;
-       db3Free(dbi);
-       return 0;
     }
 
     if (db) {
@@ -370,11 +382,22 @@ static int db0close(dbiIndex dbi, unsigned int flags) {
        break;
     }
 
+    rpmMessage(RPMMESS_DEBUG, _("closed  db file        %s\n"), urlfn);
+    /* Remove temporary databases */
+    if (dbi->dbi_temporary) {
+       rpmMessage(RPMMESS_DEBUG, _("removed db file        %s\n"), urlfn);
+       (void) unlink(fn);
+    }
+
     db3Free(dbi);
+    if (base)
+       xfree(base);
+    if (urlfn)
+       xfree(urlfn);
     return rc;
 }
 
-static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip, unsigned int flags)
+static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 {
     const char * base = NULL;
     const char * urlfn = NULL;
@@ -396,13 +419,13 @@ static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip, unsigned int flags)
        goto exit;
     }
 
-    if (dbi->dbi_rpmtag == 0) {
+    rpmMessage(RPMMESS_DEBUG, _("opening db file        %s mode 0x%x\n"),
+               urlfn, dbi->dbi_mode);
+
+    if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
        struct flock l;
        FD_t pkgs;
 
-       rpmMessage(RPMMESS_DEBUG, _("opening database mode 0x%x in %s\n"),
-               dbi->dbi_mode, fn);
-
        pkgs = fadOpen(fn, dbi->dbi_mode, dbi->dbi_perms);
        if (Ferror(pkgs)) {
            rpmError(RPMERR_DBOPEN, _("failed to open %s: %s\n"), urlfn,
@@ -435,8 +458,6 @@ exit:
     if (rc == 0 && dbip) {
        rc = 0;
        *dbip = dbi;
-if (_debug < 0)
-fprintf(stderr, "*** db%dopen: rpmtag %d dbi %p %s\n", dbi->dbi_major, rpmtag, dbi, urlfn);
     } else {
        rc = 1;
        db3Free(dbi);

diff --git a/lib/db3.c b/lib/db3.c
index 32a6f3e..35d5268 100644 (file)
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -1,6 +1,6 @@
 #include "system.h"
 
-static int _debug = -1;        /* XXX if < 0 debugging, > 0 unusual error returns */
+static int _debug = 1; /* XXX if < 0 debugging, > 0 unusual error returns */
 
 #include <db3/db.h>
 
@@ -586,8 +586,11 @@ static int db3sync(dbiIndex dbi, unsigned int flags)
     int rc;
 
 #if defined(__USE_DB2) || defined(__USE_DB3)
+    int _printit;
     rc = db->sync(db, flags);
-    rc = cvtdberr(dbi, "db->sync", rc, _debug);
+    /* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */
+    _printit = (rc == DB_INCOMPLETE ? 0 : _debug);
+    rc = cvtdberr(dbi, "db->sync", rc, _printit);
 #else  /* __USE_DB2 || __USE_DB3 */
     rc = db->sync(db, flags);
 #endif /* __USE_DB2 || __USE_DB3 */
@@ -621,7 +624,9 @@ static int db3c_get(dbiIndex dbi, DBC * dbcursor,
     int rmw;
 
 #ifdef NOTYET
-    if ((dbi->dbi_eflags & DB_INIT_CDB) && !(dbi->dbi_oflags & DB_RDONLY))
+    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
+               !(dbi->dbi_oflags & DB_RDONLY) &&
+               !(dbi->dbi_mode & O_RDWR))
        rmw = DB_RMW;
     else
 #endif
@@ -640,6 +645,7 @@ static int db3c_put(dbiIndex dbi, DBC * dbcursor,
     int rc;
 
     rc = dbcursor->c_put(dbcursor, key, data, flags);
+
     rc = cvtdberr(dbi, "dbcursor->c_put", rc, _debug);
     return rc;
 }
@@ -661,7 +667,9 @@ static inline int db3c_open(dbiIndex dbi, DBC ** dbcp)
     int rc;
 
 #if defined(__USE_DB3)
-    if ((dbi->dbi_eflags & DB_INIT_CDB) && !(dbi->dbi_oflags & DB_RDONLY))
+    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
+               !(dbi->dbi_oflags & DB_RDONLY) &&
+               !(dbi->dbi_mode & O_RDWR))
        flags = DB_WRITECURSOR;
     else
        flags = 0;
@@ -935,20 +943,21 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
     }
 
     oflags = (dbi->dbi_oeflags | dbi->dbi_oflags);
-    if (dbi->dbi_mode & O_RDWR) {
-       if ( dbi->dbi_mode & O_EXCL) oflags |= DB_EXCL;
-    } else
-       oflags |= DB_RDONLY;
+#if 0  /* XXX rpmdb: illegal flag combination specified to DB->open */
+    if ( dbi->dbi_mode & O_EXCL) oflags |= DB_EXCL;
+#endif
+    if(!(dbi->dbi_mode & O_RDWR)) oflags |= DB_RDONLY;
     if ( dbi->dbi_mode & O_CREAT) oflags |= DB_CREATE;
     if ( dbi->dbi_mode & O_TRUNC) oflags |= DB_TRUNCATE;
 
     rc = db_init(dbi, dbhome, dbfile, dbsubfile, &dbenv);
     dbi->dbi_dbinfo = NULL;
 
+    if (dbfile)
+       rpmMessage(RPMMESS_DEBUG, _("opening db index       %s/%s(%s) %s mode=0x%x\n"),
+               dbhome, dbfile, dbsubfile, prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
+
     if (rc == 0) {
-       if (dbfile)
-           rpmMessage(RPMMESS_DEBUG, _("opening db index       %s/%s(%s) %s\n"),
-               dbhome, dbfile, dbsubfile, prDbiOpenFlags(oflags, 0));
 #if defined(__USE_DB3)
        rc = db_create(&db, dbenv, dbi->dbi_cflags);
        rc = cvtdberr(dbi, "db_create", rc, _debug);

diff --git a/lib/depends.c b/lib/depends.c
index fe47b4d..8d3152e 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -854,7 +854,7 @@ alFileSatisfiesDepend(struct availableList * al,
        }
        if (keyType && keyDepend && rc)
            rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by added "
-                       "provide.\n"), keyType, keyDepend);
+                       "provide.\n"), keyType, keyDepend+2);
        break;
     }
 
@@ -878,13 +878,14 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
 
     if (suggestion) *suggestion = NULL;
 
-    {  mi =  rpmdbInitIterator(rpmdep->db, RPMDBI_DEPENDS, keyDepend, 0);
+    {  mi = rpmdbInitIterator(rpmdep->db, RPMDBI_DEPENDS, keyDepend, 0);
        if (mi) {
            rc = rpmdbGetIteratorOffset(mi);
            rpmdbFreeIterator(mi);
            rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by Depends cache.\n"), keyType, keyDepend+2);
            return rc;
        }
+       rpmdbFreeIterator(mi);
     }
 
   { const char * rcProvidesString;
@@ -987,8 +988,14 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
 
 exit:
     {  dbiIndex dbi;
-       if ((dbi = dbiOpen(rpmdep->db, 1, 0)) != NULL)
-           (void) dbiPut(dbi, keyDepend, 0, &rc, sizeof(rc), 0);
+       if ((dbi = dbiOpen(rpmdep->db, RPMDBI_DEPENDS, 0)) != NULL) {
+           int xx;
+           xx = dbiCopen(dbi, NULL, 0);
+           xx = dbiPut(dbi, keyDepend, strlen(keyDepend), &rc, sizeof(rc), 0);
+           xx = dbiCclose(dbi, NULL, 0);
+           if (xx == 0)
+               rpmMessage(RPMMESS_DEBUG, _("%s: (%s, %d) added to Depends cache.\n"), keyType, keyDepend, rc);
+       }
     }
     return rc;
 }
@@ -1496,9 +1503,8 @@ int rpmdepCheck(rpmTransactionSet rpmdep,
            }
        }
 
-       rpmdbFreeIterator(mi);
-       mi = NULL;
     }
+    rpmdbFreeIterator(mi);
 
     if (!ps.num) {
        free(ps.problems);

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 0fa5bdd..09ab372 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -1,5 +1,7 @@
 #include "system.h"
 
+static int _debug = 0;
+
 #include <sys/file.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -137,11 +139,19 @@ inline int dbiByteSwapped(dbiIndex dbi) {
     return (*dbi->dbi_vec->byteswapped) (dbi);
 }
 
-inline int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags) {
+inline int XdbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags,
+       const char * f, unsigned int l)
+{
+if (_debug < 0)
+fprintf(stderr, "+++ RMW %s (%s:%u)\n", tagName(dbi->dbi_rpmtag), f, l);
     return (*dbi->dbi_vec->copen) (dbi, dbcp, flags);
 }
 
-inline int dbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags) {
+inline int XdbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags,
+       const char * f, unsigned int l)
+{
+if (_debug < 0)
+fprintf(stderr, "--- RMW %s (%s:%u)\n", tagName(dbi->dbi_rpmtag), f, l);
     return (*dbi->dbi_vec->cclose) (dbi, dbcursor, flags);
 }
 
@@ -266,9 +276,9 @@ union _dbswap {
 static int dbiSearch(dbiIndex dbi, const char * keyp, size_t keylen,
                dbiIndexSet * setp)
 {
-    int rc;
     void * datap;
     size_t datalen;
+    int rc;
 
     if (setp) *setp = NULL;
     if (keylen == 0) keylen = strlen(keyp);
@@ -497,6 +507,7 @@ static void blockSignals(rpmdb rpmdb, sigset_t * oldMask)
 {
     sigset_t newMask;
 
+    /* XXX HACK permit ^C aborts for now ... */
     if (!(rpmdb && rpmdb->db_major == 3)) {
        sigfillset(&newMask);           /* block all signals */
        sigprocmask(SIG_BLOCK, &newMask, oldMask);
@@ -508,6 +519,7 @@ static void blockSignals(rpmdb rpmdb, sigset_t * oldMask)
  */
 static void unblockSignals(rpmdb rpmdb, sigset_t * oldMask)
 {
+    /* XXX HACK permit ^C aborts for now ... */
     if (!(rpmdb && rpmdb->db_major == 3)) {
        sigprocmask(SIG_SETMASK, oldMask, NULL);
     }
@@ -636,20 +648,31 @@ static int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp,
            int rpmtag;
 
            rpmtag = dbiTags[dbix];
+
+           switch (rpmtag) {
+           case RPMDBI_DEPENDS:
+               continue;
+               /*@notreached@*/ break;
+           default:
+               break;
+           }
+
            dbi = dbiOpen(rpmdb, rpmtag, 0);
            if (dbi == NULL)
                continue;
 
-           switch (dbix) {
-           case 0:
+           switch (rpmtag) {
+           case RPMDBI_PACKAGES:
+#if 0
                if (rpmdb->db_major == 3)
+#endif
                    goto exit;
                break;
-           case 1:
+           case RPMTAG_NAME:
                if (minimal)
                    goto exit;
                break;
-           case 2:
+           case RPMTAG_BASENAMES:
            {   void * keyp = NULL;
                int xx;
 
@@ -717,11 +740,14 @@ static Header rpmdbGetRecord(rpmdb rpmdb, unsigned int offset)
     void * keyp = &offset;
     size_t keylen = sizeof(offset);
     int rc;
+    int xx;
 
     dbi = dbiOpen(rpmdb, RPMDBI_PACKAGES, 0);
     if (dbi == NULL)
        return NULL;
+    xx = dbiCopen(dbi, NULL, 0);
     rc = dbiGet(dbi, &keyp, &keylen, &uh, &uhlen, 0);
+    xx = dbiCclose(dbi, NULL, 0);
     if (rc)
        return NULL;
     return headerLoad(uh);
@@ -740,6 +766,7 @@ static int rpmdbFindByFile(rpmdb rpmdb, const char * filespec,
     dbiIndexRecord rec = NULL;
     int i;
     int rc;
+    int xx;
 
     *matches = NULL;
     if ((baseName = strrchr(filespec, '/')) != NULL) {
@@ -760,7 +787,9 @@ static int rpmdbFindByFile(rpmdb rpmdb, const char * filespec,
     fp1 = fpLookup(fpc, dirName, baseName, 1);
 
     dbi = dbiOpen(rpmdb, RPMTAG_BASENAMES, 0);
+    xx = dbiCopen(dbi, NULL, 0);
     rc = dbiSearch(dbi, baseName, 0, &allMatches);
+    xx = dbiCclose(dbi, NULL, 0);
     if (rc) {
        dbiFreeIndexSet(allMatches);
        allMatches = NULL;
@@ -847,12 +876,17 @@ static int rpmdbFindByFile(rpmdb rpmdb, const char * filespec,
 /* XXX python/upgrade.c, install.c, uninstall.c */
 int rpmdbCountPackages(rpmdb rpmdb, const char * name)
 {
+    dbiIndex dbi;
     dbiIndexSet matches = NULL;
-    int dbix;
-    int rc;
+    int rc = -1;
+    int xx;
 
-    dbix = dbiTagToDbix(RPMTAG_NAME);
-    rc = dbiSearch(rpmdb->_dbi[dbix], name, 0, &matches);
+    dbi = dbiOpen(rpmdb, RPMTAG_NAME, 0);
+    if (dbi) {
+       xx = dbiCopen(dbi, NULL, 0);
+       rc = dbiSearch(dbi, name, 0, &matches);
+       xx = dbiCclose(dbi, NULL, 0);
+    }
 
     switch (rc) {
     default:
@@ -995,6 +1029,35 @@ static int dbiFindByLabel(dbiIndex dbi, const char * arg, dbiIndexSet * matches)
     return dbiFindMatches(dbi, localarg, chptr + 1, release, matches);
 }
 
+/**
+ * Rewrite a header in the database.
+ *   Note: this is called from a markReplacedFiles iteration, and *must*
+ *   preserve the "join key" (i.e. offset) for the header.
+ * @param dbi          index database handle (always RPMDBI_PACKAGES)
+ * @param offset       join key
+ * @param h            rpm header
+ * @return             0 on success
+ */
+static int dbiUpdateRecord(dbiIndex dbi, int offset, Header h)
+{
+    sigset_t signalMask;
+    void * uh;
+    size_t uhlen;
+    int rc;
+
+    if (_noDirTokens)
+       expandFilelist(h);
+
+    uhlen = headerSizeof(h, HEADER_MAGIC_NO);
+    uh = headerUnload(h);
+    blockSignals(dbi->dbi_rpmdb, &signalMask);
+    rc = dbiPut(dbi, &offset, sizeof(offset), uh, uhlen, 0);
+    unblockSignals(dbi->dbi_rpmdb, &signalMask);
+    free(uh);
+
+    return rc;
+}
+
 struct _rpmdbMatchIterator {
     const void *       mi_keyp;
     size_t             mi_keylen;
@@ -1016,6 +1079,7 @@ struct _rpmdbMatchIterator {
 void rpmdbFreeIterator(rpmdbMatchIterator mi)
 {
     dbiIndex dbi = NULL;
+    int xx;
 
     if (mi == NULL)
        return;
@@ -1027,7 +1091,8 @@ void rpmdbFreeIterator(rpmdbMatchIterator mi)
        headerFree(mi->mi_h);
        mi->mi_h = NULL;
     }
-    (void) dbiCclose(dbi, NULL, 0);
+    if (dbi->dbi_rmw)
+       xx = dbiCclose(dbi, NULL, 0);
 
     if (mi->mi_release) {
        xfree(mi->mi_release);
@@ -1089,13 +1154,13 @@ void rpmdbSetIteratorVersion(rpmdbMatchIterator mi, const char * version) {
 int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified) {
     int rc;
     if (mi == NULL)
-       return;
+       return 0;
     rc = mi->mi_modified;
     mi->mi_modified = modified;
     return rc;
 }
 
-Header rpmdbNextIterator(rpmdbMatchIterator mi)
+Header XrpmdbNextIterator(rpmdbMatchIterator mi, const char * f, unsigned l)
 {
     dbiIndex dbi;
     void * uh = NULL;
@@ -1103,6 +1168,7 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi)
     void * keyp;
     size_t keylen;
     int rc;
+    int xx;
 
     if (mi == NULL)
        return NULL;
@@ -1110,6 +1176,7 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi)
     dbi = dbiOpen(mi->mi_rpmdb, RPMDBI_PACKAGES, 0);
     if (dbi == NULL)
        return NULL;
+    xx = XdbiCopen(dbi, NULL, 0, f, l);
 
 top:
     /* XXX skip over instances with 0 join key */
@@ -1194,6 +1261,7 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi,
     dbiIndexSet set = NULL;
     int i;
     int rc;
+    int xx;
 
     if (!(mi && keyp))
        return 1;
@@ -1205,7 +1273,9 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi,
     if (keylen == 0)
        keylen = strlen(keyp);
 
+    xx = dbiCopen(dbi, NULL, 0);
     rc = dbiSearch(dbi, keyp, keylen, &set);
+    xx = dbiCclose(dbi, NULL, 0);
 
     switch (rc) {
     default:
@@ -1272,20 +1342,31 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb rpmdb, int rpmtag,
     if (dbi == NULL)
        return NULL;
 
+#if 0
     assert(dbi->dbi_rmw == NULL);      /* db3: avoid "lost" cursors */
+#else
+if (dbi->dbi_rmw)
+fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw);
+#endif
     assert(dbi->dbi_lastoffset == 0);  /* db0: avoid "lost" cursors */
 
     dbi->dbi_lastoffset = 0;           /* db0: rewind to beginning */
 
     if (rpmtag != RPMDBI_PACKAGES && keyp) {
        int rc;
+       int xx;
+
        if (isLabel) {
            /* XXX HACK to get rpmdbFindByLabel out of the API */
+           xx = dbiCopen(dbi, NULL, 0);
            rc = dbiFindByLabel(dbi, keyp, &set);
+           xx = dbiCclose(dbi, NULL, 0);
        } else if (rpmtag == RPMTAG_BASENAMES) {
            rc = rpmdbFindByFile(rpmdb, keyp, &set);
        } else {
+           xx = dbiCopen(dbi, NULL, 0);
            rc = dbiSearch(dbi, keyp, keylen, &set);
+           xx = dbiCclose(dbi, NULL, 0);
        }
        switch (rc) {
        default:
@@ -1399,7 +1480,7 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
 
     {  const char *n, *v, *r;
        headerNVR(h, &n, &v, &r);
-       rpmMessage(RPMMESS_VERBOSE, "  --- %s-%s-%s\n", n, v, r);
+       rpmMessage(RPMMESS_VERBOSE, "  --- %10d %s-%s-%s\n", offset, n, v, r);
     }
 
     blockSignals(rpmdb, &signalMask);
@@ -1413,25 +1494,36 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
            int rpmtype = 0;
            int rpmcnt = 0;
            int rpmtag;
+           int xx;
 
-           /* XXX FIXME: this forces all indices open */
+           dbi = NULL;
            rpmtag = dbiTags[dbix];
-           dbi = dbiOpen(rpmdb, rpmtag, 0);
 
-           if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
-               (void) dbiDel(dbi, &offset, sizeof(offset), 0);
+           switch (rpmtag) {
+           case RPMDBI_DEPENDS:
                continue;
+               /*@notreached@*/ break;
+           case RPMDBI_PACKAGES:
+               dbi = dbiOpen(rpmdb, rpmtag, 0);
+               xx = dbiCopen(dbi, NULL, 0);
+               xx = dbiDel(dbi, &offset, sizeof(offset), 0);
+               xx = dbiCclose(dbi, NULL, 0);
+               xx = dbiSync(dbi, 0);
+               continue;
+               /*@notreached@*/ break;
            }
        
-           if (!headerGetEntry(h, dbi->dbi_rpmtag, &rpmtype,
+           if (!headerGetEntry(h, rpmtag, &rpmtype,
                (void **) &rpmvals, &rpmcnt)) {
 #if 0
                rpmMessage(RPMMESS_DEBUG, _("removing 0 %s entries.\n"),
-                       tagName(dbi->dbi_rpmtag));
+                       tagName(rpmtag));
 #endif
                continue;
            }
 
+           dbi = dbiOpen(rpmdb, rpmtag, 0);
+           xx = dbiCopen(dbi, NULL, 0);
            if (rpmtype == RPM_STRING_TYPE) {
                rpmMessage(RPMMESS_DEBUG, _("removing \"%s\" from %s index.\n"), 
                        (const char *)rpmvals, tagName(dbi->dbi_rpmtag));
@@ -1470,6 +1562,7 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
                        rec, mytolerant);
                }
            }
+           xx = dbiCclose(dbi, NULL, 0);
 
            dbiSync(dbi, 0);
 
@@ -1528,35 +1621,6 @@ static inline int addIndexEntry(dbiIndex dbi, const char *index, dbiIndexRecord
     return 0;
 }
 
-/**
- * Rewrite a header in the database.
- *   Note: this is called from a markReplacedFiles iteration, and *must*
- *   preserve the "join key" (i.e. offset) for the header.
- * @param dbi          index database handle (always RPMDBI_PACKAGES)
- * @param offset       join key
- * @param h            rpm header
- * @return             0 on success
- */
-static int dbiUpdateRecord(dbiIndex dbi, int offset, Header h)
-{
-    sigset_t signalMask;
-    void * uh;
-    size_t uhlen;
-    int rc;
-
-    if (_noDirTokens)
-       expandFilelist(h);
-
-    uhlen = headerSizeof(h, HEADER_MAGIC_NO);
-    uh = headerUnload(h);
-    blockSignals(dbi->dbi_rpmdb, &signalMask);
-    rc = dbiPut(dbi, &offset, sizeof(offset), uh, uhlen, 0);
-    unblockSignals(dbi->dbi_rpmdb, &signalMask);
-    free(uh);
-
-    return rc;
-}
-
 /* XXX install.c */
 int rpmdbAdd(rpmdb rpmdb, Header h)
 {
@@ -1565,10 +1629,10 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
     int count = 0;
     int type;
     dbiIndex dbi;
-    int rpmtag;
     int dbix;
     unsigned int offset;
     int rc = 0;
+    int xx;
 
     /*
      * If old style filename tags is requested, the basenames need to be
@@ -1589,7 +1653,6 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
        size_t keylen = sizeof(firstkey);
        void * datap = NULL;
        size_t datalen = 0;
-       int rc;
 
        dbi = dbiOpen(rpmdb, RPMDBI_PACKAGES, 0);
 
@@ -1597,7 +1660,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
        datap = h;
        datalen = headerSizeof(h, HEADER_MAGIC_NO);
 
-       (void) dbiCopen(dbi, NULL, 0);
+       xx = dbiCopen(dbi, NULL, 0);
 
        /* Retrieve join key for next header instance. */
 
@@ -1616,7 +1679,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 
        rc = dbiPut(dbi, keyp, keylen, datap, datalen, 0);
 
-       (void) dbiCclose(dbi, NULL, 0);
+       xx = dbiCclose(dbi, NULL, 0);
 
     }
 
@@ -1635,41 +1698,42 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
            int rpmcnt = 0;
            int rpmtag;
 
-           /* XXX FIXME: this forces all indices open */
+           dbi = NULL;
            rpmtag = dbiTags[dbix];
-           dbi = dbiOpen(rpmdb, rpmtag, 0);
-
-           if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
-               int xx;
 
+           switch (rpmtag) {
+           case RPMDBI_DEPENDS:
+               continue;
+               /*@notreached@*/ break;
+           case RPMDBI_PACKAGES:
+               dbi = dbiOpen(rpmdb, rpmtag, 0);
+               xx = dbiCopen(dbi, NULL, 0);
                xx = dbiUpdateRecord(dbi, offset, h);
-
+               xx = dbiCclose(dbi, NULL, 0);
+               xx = dbiSync(dbi, 0);
                {   const char *n, *v, *r;
                    headerNVR(h, &n, &v, &r);
-                   rpmMessage(RPMMESS_VERBOSE, "  +++ %8d %s-%s-%s\n", offset, n, v, r);
+                   rpmMessage(RPMMESS_VERBOSE, "  +++ %10d %s-%s-%s\n", offset, n, v, r);
                }
-
                continue;
-           }
-       
+               /*@notreached@*/ break;
            /* XXX preserve legacy behavior */
-           switch (dbi->dbi_rpmtag) {
            case RPMTAG_BASENAMES:
                rpmtype = type;
                rpmvals = baseNames;
                rpmcnt = count;
                break;
            default:
-               headerGetEntry(h, dbi->dbi_rpmtag, &rpmtype,
+               headerGetEntry(h, rpmtag, &rpmtype,
                        (void **) &rpmvals, &rpmcnt);
                break;
            }
 
            if (rpmcnt <= 0) {
-               if (dbi->dbi_rpmtag != RPMTAG_GROUP) {
+               if (rpmtag != RPMTAG_GROUP) {
 #if 0
                    rpmMessage(RPMMESS_DEBUG, _("adding 0 %s entries.\n"),
-                       tagName(dbi->dbi_rpmtag));
+                       tagName(rpmtag));
 #endif
                    continue;
                }
@@ -1680,6 +1744,9 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
                rpmcnt = 1;
            }
 
+           dbi = dbiOpen(rpmdb, rpmtag, 0);
+
+           xx = dbiCopen(dbi, NULL, 0);
            if (rpmtype == RPM_STRING_TYPE) {
                rpmMessage(RPMMESS_DEBUG, _("adding \"%s\" to %s index.\n"), 
                        (const char *)rpmvals, tagName(dbi->dbi_rpmtag));
@@ -1716,6 +1783,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
                    rc += addIndexEntry(dbi, rpmvals[i], rec);
                }
            }
+           xx = dbiCclose(dbi, NULL, 0);
 
            dbiSync(dbi, 0);
 

diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 7aacbac..6f0a607 100644 (file)
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -284,11 +284,17 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags);
  * @param flags                (unused)
  */
 int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags);
+int XdbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags, const char *f, unsigned int l);
+#define        dbiCopen(_a,_b,_c) \
+       XdbiCopen(_a, _b, _c, __FILE__, __LINE__)
 
 /**
  * @param flags                (unused)
  */
 int dbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags);
+int XdbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags, const char *f, unsigned int l);
+#define        dbiCclose(_a,_b,_c) \
+       XdbiCclose(_a, _b, _c, __FILE__, __LINE__)
 
 /**
  * Delete (key,data) pair(s) from index database.

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 0aad02b..f75d797 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -425,6 +425,9 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified);
  * @return             NULL on end of iteration.
  */
 Header rpmdbNextIterator(rpmdbMatchIterator mi);
+Header XrpmdbNextIterator(rpmdbMatchIterator mi, const char * f, unsigned int l);
+#define        rpmdbNextIterator(_a) \
+       XrpmdbNextIterator(_a, __FILE__, __LINE__)
 
 /**
  * Return database iterator.

diff --git a/macros.in b/macros.in
index dd1187c..8ce482d 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,4 +1,4 @@
-# $Id: macros.in,v 1.54 2000/04/25 19:41:37 jbj Exp $
+# $Id: macros.in,v 1.55 2000/04/28 15:14:47 jbj Exp $
 #==============================================================================
 # Macro naming conventions (preliminary):
 #
@@ -243,14 +243,15 @@
 #   teardown   Should the DB3 environment be removed after use (experimental)?
 #   usecursors Should DB3 cursors be used in get/put/del (experimental)?
 #
-%__dbi_flags           mpool
+%__dbi_flags           mpool:nommap
 %__dbi_type            hash
 %__dbi_perms           perms=0644
 %__dbi_major           db%{_dbapi}
 %__dbi_other           usecursors
 %__dbi_verbose         verbose
 %__dbi_mp_mmapsize     mp_mmapsize=16Mb
-%__dbi_mp_size         mp_size=2Mb
+%__dbi_mp_size         mp_size=4Mb
+%__dbi_pagesize                pagesize=16Kb
 
 # This is a colon (or white space) separated list of tokens for Berkeley
 # dbi configuration.
@@ -263,10 +264,14 @@
   %{__dbi_verbose}\
   %{__dbi_mp_mmapsize}\
   %{__dbi_mp_size}\
+  %{__dbi_pagesize}\
 %{nil}
 
+# Depends is a per-transaction cache of known dependency resolutions.
+%_dbi_config_Depends   %{_dbi_config}:private:temporary
+
 # This is the list of tags for which indices will be built.
-%_dbi_indices  Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername
+%_dbi_indices  Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Depends
 
 #==============================================================================
 # ---- per-platform macros.

diff --git a/po/cs.po b/po/cs.po
index 2081889..7512d65 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2134,78 +2134,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "¾ádný balíèek nevlastní soubor %s\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "smyèka v øetìzu podmínek: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "odstraòuje se rejstøík souborù pro %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "nelze provést statistiku %s: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nelze otevøít %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nelze získat %s zámek k databázi"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "výhradní"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "sdílený"
 
@@ -2244,14 +2259,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2952,12 +2967,12 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2965,156 +2980,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "chyba: nelze otevøít %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "chyba pøi získávání záznamu %s z %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "chyba pøi ukládání záznamu %s do %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "chyba pøi odstraòování záznamu %s do %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "chyba: nelze otevøít %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nelze èíst hlavièku u %d pro vyhledání"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje se polo¾ka databáze\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje se rejstøík skupin\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje se rejstøík názvù\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nelze alokovat prostor pro databázi"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databáze se pøestavuje v koøenovém adresáøi %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáze %s ji¾ existuje"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "vytváøí se adresáø: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otevírá se stará databáze\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otevírá se nová databáze\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databázi je chybný -- vynechává se"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nelze pøidat záznam - pùvodnì u %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "databázi nelze pøestavit; pùvodní databáze zùstává na svém místì\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"
@@ -3712,9 +3727,6 @@ msgstr "%s: Chybn
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "odstraòuje se rejstøík konfliktù pro %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "odstraòuje se rejstøík souborù pro %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "balíèek neobsahuje soubory\n"
 

diff --git a/po/de.po b/po/de.po
index 021a734..6893db5 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -2235,80 +2235,95 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
 # , c-format
-#: lib/db0.c:394
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # , c-format
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "geteilt"
 
@@ -2347,14 +2362,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3068,12 +3083,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3081,162 +3096,162 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "kann keinen Platz für die Datenbank bekommen"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"

diff --git a/po/fi.po b/po/fi.po
index e1380fc..71ddfe8 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2172,78 +2172,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "en voinut avata %s: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "jaettua"
 
@@ -2282,14 +2297,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2990,12 +3005,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3003,156 +3018,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "en voi varata tilaa tietokannalle"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"

diff --git a/po/fr.po b/po/fr.po
index 305e95a..33b7301 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-04-27 08:36-0400\n"
+msgstr "POT-Creation-Date: 2000-04-28 11:08-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2173,78 +2173,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr ""
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr ""
 
@@ -2283,14 +2298,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2993,12 +3008,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3006,155 +3021,155 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"

diff --git a/po/ja.po b/po/ja.po
index 8b748cd..4fc6f2c 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -193,7 +193,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.49 2000/04/27 12:50:55 jbj Exp $
+# $Id: ja.po,v 1.50 2000/04/28 15:14:48 jbj Exp $
 #: rpm.c:200
 #, c-format
 msgid "rpm: %s\n"
@@ -2142,78 +2142,93 @@ msgstr "%s: %s 
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr "%s: %s ¤Ï db ¥Õ¥¡¥¤¥ë¤¬¥ê¥¹¥È¤òºî¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr "%s: %s ¤Ï rpmlib ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr "%s: %s ¤ÏËþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "¶¦Í­"
 
@@ -2252,14 +2267,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2974,12 +2989,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2987,157 +3002,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤­ÍÆÎ̤¬Â­¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
@@ -3745,9 +3760,6 @@ msgstr "rpmVerify: rpmdbOen() 
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "%s ÍѤΠconfilict ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤¬Í­¤ê¤Þ¤»¤ó\n"
 

diff --git a/po/pl.po b/po/pl.po
index 341d4ae..0a94319 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -2093,78 +2093,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "usuwanie indeksu plików dla %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/db0.c:403
-#, c-format
-msgid "opening database mode 0x%x in %s\n"
+#: lib/db0.c:422
+#, fuzzy, c-format
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr ""
 
@@ -2203,14 +2218,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2894,12 +2909,12 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2907,31 +2922,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2940,125 +2955,125 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "b³±d przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
@@ -3640,9 +3655,6 @@ msgstr "rpmVerify: rpmdbOpen() nie powiod
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "usuwanie indeksu konfliktów dla %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "usuwanie indeksu plików dla %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "pakiet nie ma plików\n"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index cb107de..0b2e5ba 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-04-27 08:36-0400\n"
+msgstr "POT-Creation-Date: 2000-04-28 11:08-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2234,80 +2234,95 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr ""
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "não foi passado pacote para instalação"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
 # , c-format
-#: lib/db0.c:394
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
 # , c-format
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr ""
 
@@ -2346,14 +2361,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3063,12 +3078,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3077,33 +3092,33 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3111,125 +3126,125 @@ msgstr ""
 
 # , c-format
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Não consegui abrir: %s\n"

diff --git a/po/rpm.pot b/po/rpm.pot
index 3b6f748..3595c36 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2024,78 +2024,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr ""
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:417
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr ""
 
@@ -2134,14 +2149,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2818,12 +2833,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2831,155 +2846,155 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, c-format
 msgid "error removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr ""
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, c-format
 msgid "key \"%s\" not found in %s"
 msgstr ""
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr ""
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 781947d..e1a15b3 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2100,78 +2100,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
 
-#: lib/db0.c:403
-#, c-format
-msgid "opening database mode 0x%x in %s\n"
+#: lib/db0.c:422
+#, fuzzy, c-format
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
@@ -2210,14 +2225,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2898,12 +2913,12 @@ msgstr ")"
 msgid "OK"
 msgstr "Ok"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2911,31 +2926,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2944,125 +2959,125 @@ msgstr ""
 "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
@@ -3643,9 +3658,6 @@ msgstr "rpmVerify: 
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ËÏÎÆÌÉËÔÏ× ÄÌÑ %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×\n"
 

diff --git a/po/sk.po b/po/sk.po
index a96fedd..abf4a1b 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2103,78 +2103,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "sluèka v re»azi po¾iadaviek: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "odstraòuje sa index súborov pre %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "chybný stav súboru: %s"
 
-#: lib/db0.c:403
-#, c-format
-msgid "opening database mode 0x%x in %s\n"
+#: lib/db0.c:422
+#, fuzzy, c-format
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "výhradný"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "zdieµaný"
 
@@ -2213,14 +2228,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2902,12 +2917,12 @@ msgstr ")"
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2915,31 +2930,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2948,125 +2963,125 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nie je mo¾né prideli» miesto pre databázu"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
@@ -3651,9 +3666,6 @@ msgstr "rpmQuery: rpmdbOpen() zlyhalo\n"
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "odstraòuje sa index kolízií pre %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "odstraòuje sa index súborov pre %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "balík neobsahuje ¾iadne súbory\n"
 

diff --git a/po/sl.po b/po/sl.po
index 35dab24..9eb1019 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.34 2000/04/27 12:50:56 jbj Exp $
+# $Id: sl.po,v 1.35 2000/04/28 15:14:48 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2086,78 +2086,93 @@ msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr "%s: %s zadovoljen ob seznamu datotek db.\n"
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr "%s: %s zadovoljen ob ponudbi db.\n"
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr "%s: %s zadovoljen ob razlièici rpmlib.\n"
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr "%s: %s nezadovoljen.\n"
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s v sporu: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "zanka v predpogojevani verigi: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "odstranjujemo seznam datotek za %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/db0.c:403
-#, c-format
-msgid "opening database mode 0x%x in %s\n"
+#: lib/db0.c:422
+#, fuzzy, c-format
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "deljeno"
 
@@ -2196,14 +2211,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2887,12 +2902,12 @@ msgstr ")"
 msgid "OK"
 msgstr "V REDU"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2900,157 +2915,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "napaka pri branju zapisa %s iz %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "napaka pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "napaka pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "paketa ni mo¾no odpreti: %s\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ni mo¾no prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "odpiramo staro podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "odpiramo novo podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke neuspe¹na; stara ostaja na istem mestu\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
@@ -3631,9 +3646,6 @@ msgstr "rpmVerify: rpmdbOpen() neuspe
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "odstranjujemo seznam sporov za %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "odstranjujemo seznam datotek za %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "paket ne vsebuje datotek\n"
 

diff --git a/po/sr.po b/po/sr.po
index 51c333c..2389d05 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2133,78 +2133,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "deljeno"
 
@@ -2243,14 +2258,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2950,12 +2965,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2963,156 +2978,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreðen"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ne mogu da zauzmem prostor za bazu podataka"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"

diff --git a/po/sv.po b/po/sv.po
index e74ebad..e2b0023 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.94 $
+# $Revision: 1.95 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2075,78 +2075,93 @@ msgstr "%s: %s uppfyllt av tillagt tillhandah
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "%s: %s uppfyllt av tillagt paket.\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från rpmrc.\n"
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr "%s: %s uppfyllt av fillistor från db.\n"
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr "%s: %s uppfyllt av tillhandahållanden (provides) från db.\n"
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "%s: %s uppfyllt av db-paket.\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr "%s: %s uppfyllt av rpmlib-version.\n"
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr "%s: %s ej uppfyllt.\n"
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "%s: %s uppfyllt av tillagt paket.\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paket %s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "cirkularitet i kedja av förutsättningar: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, fuzzy, c-format
+msgid "removed db file        %s\n"
+msgstr "tar bort filindex för %s\n"
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "felaktig filstatus: %s"
 
-#: lib/db0.c:403
-#, c-format
-msgid "opening database mode 0x%x in %s\n"
+#: lib/db0.c:422
+#, fuzzy, c-format
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "öppnar databas med rättighet 0x%x i %s\n"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "delat"
 
@@ -2185,14 +2200,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2879,12 +2894,12 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2892,31 +2907,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "fel när post %s hämtades från %s"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "fel när post %s sparades i %s"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "fel när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2925,125 +2940,125 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "kan inte öppna paket: %s\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kan inte läsa huvud vid %d för uppslagning"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort databasposter\n"
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort gruppindex\n"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "tar bort namnindex\n"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "kan inte allokera plats för databas"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "skapar katalog: %s\n"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "öppnar gammal databas\n"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "öppnar ny databas\n"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer från %s för att återställa"
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3621,8 +3636,5 @@ msgstr "rpmVerify: rpmdbOpen() misslyckades\n"
 #~ msgid "removing conflict index for %s\n"
 #~ msgstr "tar bort konfliktindex för %s\n"
 
-#~ msgid "removing file index for %s\n"
-#~ msgstr "tar bort filindex för %s\n"
-
 #~ msgid "package has no files\n"
 #~ msgstr "paketet har inga filer\n"

diff --git a/po/tr.po b/po/tr.po
index 53fb16f..ef3e916 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-27 08:36-0400\n"
+"POT-Creation-Date: 2000-04-28 11:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2171,78 +2171,93 @@ msgstr ""
 msgid "%s: %s satisfied by Depends cache.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
-#: lib/depends.c:898
+#: lib/depends.c:899
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:926
+#: lib/depends.c:927
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:944
+#: lib/depends.c:945
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:962
+#: lib/depends.c:963
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
-#: lib/depends.c:975
+#: lib/depends.c:976
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:985
+#: lib/depends.c:986
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
+#: lib/depends.c:997
+#, fuzzy, c-format
+msgid "%s: (%s, %d) added to Depends cache.\n"
+msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+
 #. requirements are not satisfied.
-#: lib/depends.c:1037
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1099
+#: lib/depends.c:1106
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
-#: lib/depends.c:1229
+#: lib/depends.c:1236
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"
 
-#: lib/db0.c:394
+#: lib/db0.c:385
+#, c-format
+msgid "closed  db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:388
+#, c-format
+msgid "removed db file        %s\n"
+msgstr ""
+
+#: lib/db0.c:417
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "%s açýlamadý: %s"
 
-#: lib/db0.c:403
+#: lib/db0.c:422
 #, fuzzy, c-format
-msgid "opening database mode 0x%x in %s\n"
+msgid "opening db file        %s mode 0x%x\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/db0.c:408 lib/url.c:445
+#: lib/db0.c:431 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/db0.c:420
+#: lib/db0.c:443
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/db0.c:421
+#: lib/db0.c:444
 msgid "shared"
 msgstr "paylaþýlan (shared)"
 
@@ -2281,14 +2296,14 @@ msgstr ""
 msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:872
+#: lib/db3.c:880
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:950
+#: lib/db3.c:957
 #, c-format
-msgid "opening db index       %s/%s(%s) %s\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2990,12 +3005,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:92
+#: lib/rpmdb.c:94
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:210
+#: lib/rpmdb.c:220
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3003,157 +3018,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:225
+#: lib/rpmdb.c:235
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "hata: %s eriþilemiyor\n"
 
-#: lib/rpmdb.c:279
+#: lib/rpmdb.c:289
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:"
 
-#: lib/rpmdb.c:396
+#: lib/rpmdb.c:406
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "%s kaydý %s dosyasýna yazýlamýyor"
 
-#: lib/rpmdb.c:405
+#: lib/rpmdb.c:415
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:591 lib/rpmdb.c:1979
+#: lib/rpmdb.c:603 lib/rpmdb.c:2047
 msgid "no dbpath has been set"
 msgstr "dbpath deðeri girilmemiþ"
 
-#: lib/rpmdb.c:669
+#: lib/rpmdb.c:692
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:860
+#: lib/rpmdb.c:894
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
 
-#: lib/rpmdb.c:926 lib/rpmdb.c:1395 lib/uninstall.c:90
+#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydýndan baþlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1350
+#: lib/rpmdb.c:1431
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:1358
+#: lib/rpmdb.c:1439
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:1429
+#: lib/rpmdb.c:1519
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1436
+#: lib/rpmdb.c:1528
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1536
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1448
+#: lib/rpmdb.c:1540
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:1624
+#: lib/rpmdb.c:1687
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "Veritabaný için yer bulunamadý"
 
-#: lib/rpmdb.c:1671
+#: lib/rpmdb.c:1735
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1684
+#: lib/rpmdb.c:1751
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1691
+#: lib/rpmdb.c:1758
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1695
+#: lib/rpmdb.c:1762
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2004
+#: lib/rpmdb.c:2072
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2008
+#: lib/rpmdb.c:2076
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2014
+#: lib/rpmdb.c:2082
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2016
+#: lib/rpmdb.c:2084
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2023
+#: lib/rpmdb.c:2091
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2032
+#: lib/rpmdb.c:2100
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2054
+#: lib/rpmdb.c:2122
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rpmdb.c:2086
+#: lib/rpmdb.c:2154
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d de yer alan kayýt saklayamýyor"
 
-#: lib/rpmdb.c:2104
+#: lib/rpmdb.c:2172
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2112
+#: lib/rpmdb.c:2180
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2114
+#: lib/rpmdb.c:2182
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2120
+#: lib/rpmdb.c:2188
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"

diff --git a/rpm.spec b/rpm.spec
index 3d5d9b2..97afcde 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.1
 Version: %{version}
-Release: 0.12
+Release: 0.13
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -219,6 +219,14 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Fri Apr 28 2000 Jeff Johnson <jbj@redhat.com>
+- Filter DB_INCOMPLETE on db->sync, it's usually harmless.
+- Add per-transaction cache of resolved dependencies (aka Depends).
+- Do lazy dbi{Open,Close} throughout.
+- Attempt fine grained dbi cursors throughout.
+- fix: free iterator *after* loop, not during.
+- fix: Depends needed keylen in dbiPut, rpmdbFreeIterator after use.
+
 * Thu Apr 27 2000 Jeff Johnson <jbj@redhat.com>
 - API: replace rpmdbUpdateRecord with rpmdbSetIteratorModified.
 - API: replace rpmdbFindByLabel with RPMDBI_LABEL iteration.