From 903a070e8de00c6cf6a1479994c70027eccdfd78 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 9 Jan 2001 21:46:11 +0000 Subject: [PATCH] - fix: digests on input FD_t dinna work. - fix: remove rebuilddb debugging leakage. CVS patchset: 4421 CVS date: 2001/01/09 21:46:11 --- CHANGES | 2 ++ lib/Makefile.am | 2 +- lib/depends.c | 9 ++++++++ lib/rpmdb.c | 5 ++--- po/cs.po | 24 +++++++++++----------- po/da.po | 24 +++++++++++----------- po/de.po | 24 +++++++++++----------- po/es.po | 24 +++++++++++----------- po/eu_ES.po | 24 +++++++++++----------- po/fi.po | 24 +++++++++++----------- po/fr.po | 24 +++++++++++----------- po/gl.po | 24 +++++++++++----------- po/hu.po | 24 +++++++++++----------- po/id.po | 24 +++++++++++----------- po/is.po | 24 +++++++++++----------- po/it.po | 24 +++++++++++----------- po/ja.po | 26 +++++++++++------------ po/ko.po | 24 +++++++++++----------- po/no.po | 24 +++++++++++----------- po/pl.po | 24 +++++++++++----------- po/pt.po | 24 +++++++++++----------- po/pt_BR.po | 24 +++++++++++----------- po/ro.po | 24 +++++++++++----------- po/rpm.pot | 24 +++++++++++----------- po/ru.po | 24 +++++++++++----------- po/sk.po | 24 +++++++++++----------- po/sl.po | 26 +++++++++++------------ po/sr.po | 24 +++++++++++----------- po/sv.po | 24 +++++++++++----------- po/tr.po | 24 +++++++++++----------- po/uk.po | 24 +++++++++++----------- po/wa.po | 24 +++++++++++----------- po/zh.po | 24 +++++++++++----------- po/zh_CN.GB2312.po | 24 +++++++++++----------- rpm.spec | 6 +++++- rpm.spec.in | 6 +++++- rpmio/Makefile.am | 4 ++++ rpmio/rpmio.c | 12 +++++------ rpmio/rpmio_internal.h | 8 ++++---- rpmio/tdigest.c | 56 ++++++++++++++++++++++++++++++++++++++++++-------- 40 files changed, 447 insertions(+), 387 deletions(-) diff --git a/CHANGES b/CHANGES index f6e9cdd..9aa3fd7 100644 --- a/CHANGES +++ b/CHANGES @@ -96,6 +96,8 @@ - fix: 3 packages from Red Hat 5.2 had bogus %verifyscript tag. - tsorted packages processed in successor count order. - fix: resurrect --excludepath (#19666). + - fix: digests on input FD_t dinna work. + - fix: remove rebuilddb debugging leakage. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/Makefile.am b/lib/Makefile.am index 7793f84..8c85d9a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -46,7 +46,7 @@ tagtable.c: rpmlib.h @echo '#include "rpmlib.h"' >> tagtable.c @echo '' >> tagtable.c @echo 'const struct headerTagTableEntry rpmTagTable[] = {' >> tagtable.c - awk '/(RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ && !/internal/ { if ($$2 == "=") { printf("\t{ \"%s\", %s },\n", $$1, $$3); } else { printf("\t{ \"%s\", %s },\n", $$2, $$3); } }' < $(srcdir)/rpmlib.h >> tagtable.c + $(AWK) '/(RPMTAG_[A-Z0-9]*)[ \t]+([0-9]*)/ && !/internal/ { if ($$2 == "=") { printf("\t{ \"%s\", %s },\n", $$1, $$3); } else { printf("\t{ \"%s\", %s },\n", $$2, $$3); } }' < $(srcdir)/rpmlib.h >> tagtable.c @echo ' { NULL, 0 }' >> tagtable.c @echo '};' >> tagtable.c @echo '' >> tagtable.c diff --git a/lib/depends.c b/lib/depends.c index 04287f0..d55721c 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1648,6 +1648,8 @@ int rpmdepOrder(rpmTransactionSet rpmdep) struct orderListIndex * orderList; int nrescans = 10; int qlen; + int qd = 0x10000; + int qcnt; int i, j; alMakeIndex(&rpmdep->addedPackages); @@ -1723,6 +1725,10 @@ rescan: qlen++; } + /* Mark all the roots in the forest with a tree id for sorting. */ + for (qcnt = qd * (qlen+1), p = q; p != NULL; qcnt -= qd, p = p->tsi.tsi_suc) + p->tsi.tsi_qcnt = qcnt; + /* T5. Output fromt of queue (T7. Remove from queue.) */ for (; q != NULL; q = q->tsi.tsi_suc) { @@ -1743,6 +1749,9 @@ rescan: if ((--p->tsi.tsi_count) <= 0) { /* XXX FIXME: add control bit. */ p->tsi.tsi_suc = NULL; + /* Inherit parent's sort factor. */ + if (p->tsi.tsi_qcnt < q->tsi.tsi_qcnt) + p->tsi.tsi_qcnt = q->tsi.tsi_qcnt - 1; addQ(p, &q->tsi.tsi_suc, &r); qlen++; } diff --git a/lib/rpmdb.c b/lib/rpmdb.c index a2bf192..8573e87 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -2435,10 +2435,7 @@ int rpmdbRebuild(const char * rootdir) /* RPMDBI_PACKAGES */ mi = rpmdbInitIterator(olddb, RPMDBI_PACKAGES, NULL, 0); while ((h = rpmdbNextIterator(mi)) != NULL) { - const char * name, * version, * release; - headerNVR(h, &name, &version, &release); -fprintf(stderr, "=== %s-%s-%s\n", name, version, release); /* let's sanity check this record a bit, otherwise just skip it */ if (!(headerIsEntry(h, RPMTAG_NAME) && headerIsEntry(h, RPMTAG_VERSION) && @@ -2453,8 +2450,10 @@ fprintf(stderr, "=== %s-%s-%s\n", name, version, release); /* Filter duplicate entries ? (bug in pre rpm-3.0.4) */ if (_db_filter_dups || newdb->db_filter_dups) { + const char * name, * version, * release; int skip = 0; + headerNVR(h, &name, &version, &release); { rpmdbMatchIterator mi; mi = rpmdbInitIterator(newdb, RPMTAG_NAME, name, 0); diff --git a/po/cs.po b/po/cs.po index 82ae3fc..568e539 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2455,20 +2455,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3527,36 +3527,36 @@ msgstr "otev msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "záznam èíslo %d v databázi je chybný -- vynechávám." -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nemohu pøidat záznam - pùvodnì u %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" diff --git a/po/da.po b/po/da.po index c4dc087..a3b8354 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -2416,20 +2416,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3439,35 +3439,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "fjener kataloget %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/de.po b/po/de.po index 11c3644..e92fe12 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2651,20 +2651,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3733,37 +3733,37 @@ msgstr "Datenbank aus der vorhandenen neu erstellen" msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/es.po b/po/es.po index 4464cc3..c41c52f 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index e2fce48..f6548be 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 7afde60..3013bda 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2573,20 +2573,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3636,35 +3636,35 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "en voi lisätä tietuetta %d:stä" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, 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 574247a..b96e02f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2001-01-08 23:06-0500\n" +msgstr "POT-Creation-Date: 2001-01-09 16:35-0500\n" #: build.c:26 #, fuzzy, c-format @@ -2585,20 +2585,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3653,35 +3653,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index 4464cc3..c41c52f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 4464cc3..c41c52f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 4464cc3..c41c52f 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 6476dd6..1102af6 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2416,20 +2416,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3440,35 +3440,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index 4464cc3..c41c52f 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 1a11a0f..0242bf0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.143 2001/01/09 04:07:51 jbj Exp $ +# $Id: ja.po,v 1.144 2001/01/09 21:46:14 jbj Exp $ #: rpm.c:185 rpmqv.c:386 #, c-format msgid "rpm: %s\n" @@ -2536,20 +2536,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3614,37 +3614,37 @@ msgstr " msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, fuzzy, c-format msgid "record number %d in database is bad -- skipping." msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" diff --git a/po/ko.po b/po/ko.po index 4464cc3..c41c52f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/no.po b/po/no.po index 297fef5..3965eb0 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2437,20 +2437,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3467,35 +3467,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index f649b4e..74d73e0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2534,20 +2534,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3589,36 +3589,36 @@ msgstr "otwieranie starej bazy danych\n" msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 #, fuzzy 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:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, 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:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" diff --git a/po/pt.po b/po/pt.po index a7b958b..0309118 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -2380,20 +2380,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3402,35 +3402,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8bbb254..d370149 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2001-01-08 23:06-0500\n" +msgstr "POT-Creation-Date: 2001-01-09 16:35-0500\n" # , c-format #: build.c:26 @@ -2652,20 +2652,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3731,25 +3731,25 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente" msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3762,13 +3762,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM versão %s\n" # , c-format -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Não consegui abrir: %s\n" diff --git a/po/ro.po b/po/ro.po index d22641e..cae50e3 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -2378,20 +2378,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3398,35 +3398,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index e2fce48..f6548be 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index b8ff5ca..6953b40 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -2470,20 +2470,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3545,36 +3545,36 @@ msgstr " msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ." -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index 2bcf1ec..843fc59 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2543,20 +2543,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3596,36 +3596,36 @@ msgstr "otv msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 #, fuzzy 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:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, 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:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" diff --git a/po/sl.po b/po/sl.po index e212362..d3e7541 100644 --- 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 , 2000. -# $Id: sl.po,v 1.128 2001/01/09 04:07:53 jbj Exp $ +# $Id: sl.po,v 1.129 2001/01/09 21:46:23 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2527,20 +2527,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3610,38 +3610,38 @@ msgstr "odpiranje stare podatkovne zbirke\n" msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "zapisa ni mo¾no dodati na %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" diff --git a/po/sr.po b/po/sr.po index a3f1f8c..bbe1b21 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -2537,20 +2537,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3598,35 +3598,35 @@ msgstr "rekreiraj bazu podataka iz postoje msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "ne mogu da dodam slog originalno na %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, 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 4a21e07..002a4f7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2445,20 +2445,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3522,35 +3522,35 @@ msgstr " msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "kan inte lägga till post ursprungligen vid %d" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, 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:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" diff --git a/po/tr.po b/po/tr.po index 243b82f..c7b735b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2585,20 +2585,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3650,35 +3650,35 @@ msgstr "mevcut veritaban msgid "opening new database with dbapi %d\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, 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:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "%d de yer alan kayýt saklayamýyor" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s açýlamadý: %s" diff --git a/po/uk.po b/po/uk.po index 4464cc3..c41c52f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 4464cc3..c41c52f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 4464cc3..c41c52f 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 4464cc3..c41c52f 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-01-08 23:06-0500\n" +"POT-Creation-Date: 2001-01-09 16:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1660 +#: lib/depends.c:1662 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1710 +#: lib/depends.c:1712 msgid "========== tsorting packages\n" msgstr "" -#: lib/depends.c:1807 +#: lib/depends.c:1816 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1838 +#: lib/depends.c:1847 msgid "========== continuing tsort ...\n" msgstr "" @@ -3403,35 +3403,35 @@ msgstr "" msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2449 +#: lib/rpmdb.c:2446 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2484 +#: lib/rpmdb.c:2483 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2502 +#: lib/rpmdb.c:2501 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2510 +#: lib/rpmdb.c:2509 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2512 +#: lib/rpmdb.c:2511 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2522 +#: lib/rpmdb.c:2521 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2524 +#: lib/rpmdb.c:2523 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/rpm.spec b/rpm.spec index d3de17b..67aa59a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.19 +Release: 0.20 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Tue Jan 9 2001 Jeff Johnson +- fix: digests on input FD_t dinna work. +- fix: remove rebuilddb debugging leakage. + * Mon Jan 8 2001 Jeff Johnson - tsorted packages processed in successor count order. - fix: resurrect --excludepath (#19666). diff --git a/rpm.spec.in b/rpm.spec.in index 863fea5..22e87ed 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -13,7 +13,7 @@ Summary: The Red Hat package management system. Name: rpm %define version @VERSION@ Version: %{version} -Release: 0.19 +Release: 0.20 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -309,6 +309,10 @@ fi %{__prefix}/include/popt.h %changelog +* Tue Jan 9 2001 Jeff Johnson +- fix: digests on input FD_t dinna work. +- fix: remove rebuilddb debugging leakage. + * Mon Jan 8 2001 Jeff Johnson - tsorted packages processed in successor count order. - fix: resurrect --excludepath (#19666). diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index d0bbf29..08786f9 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -27,11 +27,15 @@ install-data-local: lclint: lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) +trpmio.o: trpmio.c + trpmio: librpmio.la trpmio.o $(LINK) -o $@ trpmio.o librpmio.la $(top_builddir)/popt/libpopt.la +tkey.o: tkey.c tkey: librpmio.la tkey.o $(LINK) -o $@ tkey.o librpmio.la $(top_builddir)/popt/libpopt.la +tdigest.o: tdigest.c tdigest: librpmio.la tdigest.o $(LINK) -o $@ tdigest.o librpmio.la $(top_builddir)/popt/libpopt.la diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index ae601d2..fb8a4a9 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -288,7 +288,7 @@ ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count) { rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count)); fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && rc > 0) rpmDigestUpdate(fd->digest, buf, rc); DBGIO(fd, (stderr, "==>\tfdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd))); @@ -302,7 +302,7 @@ ssize_t fdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && count > 0) rpmDigestUpdate(fd->digest, buf, count); if (fd->wr_chunked) { char chunksize[20]; @@ -1921,7 +1921,7 @@ DBGIO(fd, (stderr, "==>\tgzdRead(%p,%p,%u) rc %lx %s\n", cookie, buf, (unsigned) } } else if (rc >= 0) { fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && rc > 0) rpmDigestUpdate(fd->digest, buf, rc); } return rc; } @@ -1933,7 +1933,7 @@ static ssize_t gzdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && count > 0) rpmDigestUpdate(fd->digest, buf, count); gzfile = gzdFileno(fd); fdstat_enter(fd, FDSTAT_WRITE); @@ -2106,7 +2106,7 @@ static ssize_t bzdRead(void * cookie, /*@out@*/ char * buf, size_t count) { fd->errcookie = bzerror(bzfile, &zerror); } else if (rc >= 0) { fdstat_exit(fd, FDSTAT_READ, rc); - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && rc > 0) rpmDigestUpdate(fd->digest, buf, rc); } return rc; } @@ -2118,7 +2118,7 @@ static ssize_t bzdWrite(void * cookie, const char * buf, size_t count) { if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */ - if (fd->digest) rpmDigestUpdate(fd->digest, buf, count); + if (fd->digest && count > 0) rpmDigestUpdate(fd->digest, buf, count); bzfile = bzdFileno(fd); fdstat_enter(fd, FDSTAT_WRITE); diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 775a8d6..3cb639d 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -357,8 +357,8 @@ int ufdClose( /*@only@*/ void * cookie); */ /*@unused@*/ static inline void fdFiniMD5(FD_t fd, void **datap, size_t *lenp, int asAscii) { if (fd->digest == NULL) { - *datap = NULL; - *lenp = 0; + if (datap) *datap = NULL; + if (lenp) *lenp = 0; return; } rpmDigestFinal(fd->digest, datap, lenp, asAscii); @@ -369,8 +369,8 @@ int ufdClose( /*@only@*/ void * cookie); */ /*@unused@*/ static inline void fdFiniSHA1(FD_t fd, void **datap, size_t *lenp, int asAscii) { if (fd->digest == NULL) { - *datap = NULL; - *lenp = 0; + if (datap) *datap = NULL; + if (lenp) *lenp = 0; return; } rpmDigestFinal(fd->digest, datap, lenp, asAscii); diff --git a/rpmio/tdigest.c b/rpmio/tdigest.c index 9609326..8460c42 100644 --- a/rpmio/tdigest.c +++ b/rpmio/tdigest.c @@ -4,6 +4,7 @@ #include "debug.h" static rpmDigestFlags flags = RPMDIGEST_MD5; +extern int _rpmio_debug; #define _POPT_SET_BIT (POPT_ARG_VAL|POPT_ARGFLAG_OR) @@ -11,6 +12,7 @@ static struct poptOption optionsTable[] = { { "md5", '\0', _POPT_SET_BIT, &flags, RPMDIGEST_MD5, NULL, NULL }, { "sha1",'\0', _POPT_SET_BIT, &flags, RPMDIGEST_SHA1, NULL, NULL }, { "native",'\0', _POPT_SET_BIT, &flags, RPMDIGEST_NATIVE, NULL, NULL }, + { "debug",'d', POPT_ARG_VAL, &_rpmio_debug, -1, NULL, NULL }, { NULL, '\0', 0, NULL, 0, NULL, NULL } }; @@ -19,7 +21,8 @@ main(int argc, const char *argv[]) { poptContext optCon; const char ** args; - const char *fn; + const char * ifn; + const char * ofn = "/dev/null"; int rc; optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0); @@ -28,34 +31,69 @@ main(int argc, const char *argv[]) args = poptGetArgs(optCon); rc = 0; - while ((fn = *args++) != NULL) { - FD_t fd = Fopen(fn, "r.ufdio"); + while ((ifn = *args++) != NULL) { + FD_t ifd; + FD_t ofd; unsigned char buf[BUFSIZ]; ssize_t nb; DIGEST_CTX ctx; + const char * idigest; + const char * odigest; const char * digest; size_t digestlen; - if (fd == NULL || Ferror(fd)) { - fprintf(stderr, _("cannot open %s: %s\n"), fn, Fstrerror(fd)); - if (fd) Fclose(fd); + ifd = Fopen(ifn, "r.ufdio"); + if (ifd == NULL || Ferror(ifd)) { + fprintf(stderr, _("cannot open %s: %s\n"), ifn, Fstrerror(ifd)); + if (ifd) Fclose(ifd); rc++; continue; } + idigest = NULL; + (flags & RPMDIGEST_SHA1) ? fdInitSHA1(ifd) : fdInitMD5(ifd, 0); + + ofd = Fopen(ofn, "w.ufdio"); + if (ofd == NULL || Ferror(ofd)) { + fprintf(stderr, _("cannot open %s: %s\n"), ofn, Fstrerror(ofd)); + if (ifd) Fclose(ifd); + if (ofd) Fclose(ofd); + rc++; + continue; + } + odigest = NULL; + (flags & RPMDIGEST_SHA1) ? fdInitSHA1(ofd) : fdInitMD5(ofd, 0); ctx = rpmDigestInit(flags); - while ((nb = Fread(buf, 1, sizeof(buf), fd)) > 0) + while ((nb = Fread(buf, 1, sizeof(buf), ifd)) > 0) { rpmDigestUpdate(ctx, buf, nb); - Fclose(fd); + (void) Fwrite(buf, 1, nb, ofd); + } + + fdFiniMD5(ifd, (void **)&idigest, NULL, 1); + Fclose(ifd); + + Fflush(ofd); + fdFiniMD5(ofd, (void **)&odigest, NULL, 1); + Fclose(ofd); rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1); if (digest) { - fprintf(stdout, "%s %s\n", digest, fn); + fprintf(stdout, "%s %s\n", digest, ifn); fflush(stdout); free((void *)digest); } + if (idigest) { + fprintf(stdout, "%s in %s\n", idigest, ifn); + fflush(stdout); + free((void *)idigest); + } + if (odigest) { + fprintf(stdout, "%s out %s\n", odigest, ofn); + fflush(stdout); + free((void *)odigest); + } } return rc; } -- 2.7.4