- re-resurrect firstkey/nextkey python bindings for up2date compatibility.

CVS patchset: 3992
CVS date: 2000/07/29 20:31:56

32 files changed, 368 insertions, 270 deletions

diff --git a/lib/db1.c b/lib/db1.c
index 2ef360d63..6f634d9f7 100644
--- a/lib/db1.c
+++ b/lib/db1.c
@@ -431,9 +431,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 
 	pkgs = fadOpen(fn, dbi->dbi_mode, dbi->dbi_perms);
 	if (Ferror(pkgs)) {
-	    rc = EFAULT;
-	    rpmError(RPMERR_DBOPEN, _("failed to open %s: %s\n"), urlfn,
-		Fstrerror(pkgs));
+	    rc = errno;		/* XXX check errno validity */
 	    goto exit;
 	}
 
@@ -447,7 +445,7 @@ static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	    l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK;
 
 	    if (Fcntl(pkgs, F_SETLK, (void *) &l)) {
-		rc = EFAULT;
+		rc = errno;	/* XXX check errno validity */
 		rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"),
 		    ((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared")));
 		goto exit;
diff --git a/po/cs.po b/po/cs.po
index 1fe188af4..ee12cf076 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 2000-07-27 15:59+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2330,21 +2330,17 @@ msgstr "¹patný db soubor %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otevírám db soubor     %s mode 0x%x\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr "nemohu otevøít %s: %s\n"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nemohu zamknout databázi %s"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "výhradní"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "sdílený"
 
@@ -3921,6 +3917,11 @@ msgstr "chyba: %sport musí být èíslo\n"
 msgid "url port must be a number\n"
 msgstr "url port musí být èíslo\n"
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr "nemohu otevøít %s: %s\n"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/da.po b/po/da.po
index 097c2da96..bdcaddd44 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -2294,21 +2294,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3852,6 +3848,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/de.po b/po/de.po
index 64d29fc62..596beed62 100644
--- 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-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2534,22 +2534,17 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-# , c-format
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "Öffnen von %s fehlgeschlagen: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "geteilt"
 
@@ -4186,6 +4181,12 @@ msgid "url port must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
 # , c-format
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "Öffnen von %s fehlgeschlagen: %s"
+
+# , c-format
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/es.po b/po/es.po
index 19aae58de..4152a8229 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 5af94b051..524494e76 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2473,21 +2473,17 @@ msgstr "en voinut avata %s: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "en voinut avata %s: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "jaettua"
 
@@ -4097,6 +4093,11 @@ msgstr "virhe: ftpport pitää olla luku\n"
 msgid "url port must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "en voinut avata %s: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/fr.po b/po/fr.po
index b55754879..79987ad98 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-29 13:25-0400\n"
+msgstr "POT-Creation-Date: 2000-07-29 16:29-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2467,21 +2467,17 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -4072,6 +4068,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/gl.po b/po/gl.po
index 19aae58de..4152a8229 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 19aae58de..4152a8229 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/id.po b/po/id.po
index 19aae58de..4152a8229 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/is.po b/po/is.po
index 0211bb8cd..46db7c6f0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -2268,21 +2268,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3826,6 +3822,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/it.po b/po/it.po
index 19aae58de..4152a8229 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index c744da448..efb443813 100644
--- 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-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -83,7 +83,7 @@ msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.103 2000/07/29 17:30:19 jbj Exp $
+# $Id: ja.po,v 1.104 2000/07/29 20:31:57 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2415,21 +2415,17 @@ msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "¶¦Í­"
 
@@ -4055,6 +4051,11 @@ msgstr "¥¨¥é¡¼: %s¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 msgid "url port must be a number\n"
 msgstr "url ¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/ko.po b/po/ko.po
index 19aae58de..4152a8229 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/no.po b/po/no.po
index 3e2bc5df3..1a393eee1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2298,21 +2298,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3856,6 +3852,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 5e1a1f488..a29017350 100644
--- 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-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2416,21 +2416,17 @@ msgstr "b³êdny status pliku: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "nie mo¿na otworzyæ %s: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -4006,6 +4002,11 @@ msgstr "b³±d: %sport musi byæ liczb±\n"
 msgid "url port must be a number\n"
 msgstr "port musi byæ liczb±\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "nie mo¿na otworzyæ %s: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/pt.po b/po/pt.po
index 19aae58de..4152a8229 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 175d77a61..67adb8247 100644
--- 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-07-29 13:25-0400\n"
+msgstr "POT-Creation-Date: 2000-07-29 16:29-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2535,22 +2535,17 @@ msgstr "Não consegui abrir: %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/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "Não consegui abrir: %s\n"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -4201,6 +4196,12 @@ msgid "url port must be a number\n"
 msgstr ""
 
 # , c-format
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "Não consegui abrir: %s\n"
+
+# , c-format
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/ro.po b/po/ro.po
index 875505503..fda42c1cd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -2268,21 +2268,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3826,6 +3822,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/rpm.pot b/po/rpm.pot
index 19aae58de..4152a8229 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 24338cbd6..56f0ada5a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2420,21 +2420,17 @@ msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
@@ -4005,6 +4001,11 @@ msgstr "ÏÛÉÂËÁ: %sport ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
 msgid "url port must be a number\n"
 msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/sk.po b/po/sk.po
index fbed4e362..9722eba3b 100644
--- 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-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2425,21 +2425,17 @@ msgstr "chybný stav súboru: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "nepodarilo sa otvori» %s: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "výhradný"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "zdieµaný"
 
@@ -4015,6 +4011,11 @@ msgstr "chyba: %sport musí by» èíslo\n"
 msgid "url port must be a number\n"
 msgstr "url port musí by» èíslo\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "nepodarilo sa otvori» %s: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/sl.po b/po/sl.po
index 98e71cacc..15f018421 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.88 2000/07/29 17:30:21 jbj Exp $
+# $Id: sl.po,v 1.89 2000/07/29 20:31:58 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2410,21 +2410,17 @@ msgstr "okvarjeno stanje datoteke: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr "neuspe¹no odpiranje %s: %s\n"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "deljeno"
 
@@ -3994,6 +3990,11 @@ msgstr "napaka: vrata %s morajo biti ¹tevilka\n"
 msgid "url port must be a number\n"
 msgstr "vrata URL morajo biti ¹tevilka\n"
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr "neuspe¹no odpiranje %s: %s\n"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/sr.po b/po/sr.po
index dd44bb03b..0838de742 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2430,21 +2430,17 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "neuspelo otvaranje %s: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "deljeno"
 
@@ -4052,6 +4048,11 @@ msgstr "gre¹ka: FTP port mora biti broj\n"
 msgid "url port must be a number\n"
 msgstr "gre¹ka: FTP port mora biti broj\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "neuspelo otvaranje %s: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/sv.po b/po/sv.po
index c936bd756..ef64d7000 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-0400\n"
 "PO-Revision-Date: 2000-07-24 22:14+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2319,21 +2319,17 @@ msgstr "felaktig db-fil %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "öppnar db-fil          %s rättighet 0x%x\n"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr "kunde inte öppna %s: %s\n"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "delat"
 
@@ -3914,6 +3910,11 @@ msgstr "fel: %s-port måste vara ett tal\n"
 msgid "url port must be a number\n"
 msgstr "url-port måste vara ett tal\n"
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr "kunde inte öppna %s: %s\n"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 04f0ecdc2..e1b062070 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2472,21 +2472,17 @@ msgstr "%s açýlamadý: %s"
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, fuzzy, c-format
-msgid "failed to open %s: %s\n"
-msgstr "%s açýlamadý: %s"
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr "paylaþýlan (shared)"
 
@@ -4098,6 +4094,11 @@ msgstr "hata: ftpport bir sayý olmalý\n"
 msgid "url port must be a number\n"
 msgstr "hata: ftpport bir sayý olmalý\n"
 
+#: rpmio/url.c:445
+#, fuzzy, c-format
+msgid "failed to open %s: %s\n"
+msgstr "%s açýlamadý: %s"
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, fuzzy, c-format
diff --git a/po/uk.po b/po/uk.po
index 19aae58de..4152a8229 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/wa.po b/po/wa.po
index 19aae58de..4152a8229 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/zh.po b/po/zh.po
index 19aae58de..4152a8229 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 19aae58de..4152a8229 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-29 13:25-0400\n"
+"POT-Creation-Date: 2000-07-29 16:29-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"
@@ -2273,21 +2273,17 @@ msgstr ""
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db1.c:435 rpmio/url.c:445
-#, c-format
-msgid "failed to open %s: %s\n"
-msgstr ""
-
-#: lib/db1.c:451
+#. XXX check errno validity
+#: lib/db1.c:449
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:452 lib/db3.c:1097
+#: lib/db1.c:450 lib/db3.c:1097
 msgid "shared"
 msgstr ""
 
@@ -3831,6 +3827,11 @@ msgstr ""
 msgid "url port must be a number\n"
 msgstr ""
 
+#: rpmio/url.c:445
+#, c-format
+msgid "failed to open %s: %s\n"
+msgstr ""
+
 #. XXX Fstrerror
 #: rpmio/url.c:462
 #, c-format
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 63d02305d..e73e9746f 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -28,6 +28,8 @@ typedef struct hdrObject_s hdrObject;
 
 /* rpmdb functions */
 static void rpmdbDealloc(rpmdbObject * s);
+static PyObject * rpmdbFirst(rpmdbObject * s, PyObject * args);
+static PyObject * rpmdbNext(rpmdbObject * s, PyObject * args);
 static PyObject * rpmdbGetAttr(rpmdbObject * s, char * name);
 static PyObject * rpmdbByName(rpmdbObject * s, PyObject * args);
 static PyObject * rpmdbByProvides(rpmdbObject * s, PyObject * args);
@@ -92,6 +94,9 @@ static void mungeFilelist(Header h);
 struct rpmdbObject_s {
     PyObject_HEAD;
     rpmdb db;
+    int offx;
+    int noffs;
+    int *offsets;
 } ;
 
 struct rpmdbMIObject_s {
@@ -233,6 +238,8 @@ static PyTypeObject rpmtransType = {
 };
 
 static struct PyMethodDef rpmdbMethods[] = {
+	{"firstkey",	    (PyCFunction) rpmdbFirst,	1 },
+	{"nextkey",	    (PyCFunction) rpmdbNext,	1 },
 	{"findbyfile",	    (PyCFunction) rpmdbByFile, 1 },
 	{"findbyname",	    (PyCFunction) rpmdbByName, 1 },
 	{"findbyprovides",  (PyCFunction) rpmdbByProvides, 1 },
@@ -550,6 +557,9 @@ static rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) {
 
     o = PyObject_NEW(rpmdbObject, &rpmdbType);
     o->db = NULL;
+    o->offx = 0;
+    o->noffs = 0;
+    o->offsets = NULL;
 
     if (rpmdbOpen(root, &o->db, forWrite ? O_RDWR | O_CREAT: O_RDONLY, 0644)) {
 	char * errmsg = "cannot open database in %s";
@@ -817,11 +827,71 @@ static PyObject * rpmdbGetAttr(rpmdbObject * s, char * name) {
 }
 
 static void rpmdbDealloc(rpmdbObject * s) {
+    if (s->offsets) {
+	free(s->offsets);
+    }
     if (s->db) {
 	rpmdbClose(s->db);
     }
 }
 
+static PyObject * rpmdbFirst(rpmdbObject * s, PyObject * args) {
+    int first;
+
+    if (!PyArg_ParseTuple (args, "")) return NULL;
+
+    /* Acquire all offsets in one fell swoop. */
+    if (s->offsets == NULL || s->noffs <= 0) {
+	rpmdbMatchIterator mi;
+	Header h;
+
+	if (s->offsets)
+	    free(s->offsets);
+	s->offsets = NULL;
+	s->noffs = 0;
+	mi = rpmdbInitIterator(s->db, RPMDBI_PACKAGES, NULL, 0);
+	while ((h = rpmdbNextIterator(mi)) != NULL) {
+	    s->noffs++;
+	    s->offsets = realloc(s->offsets, s->noffs * sizeof(s->offsets[0]));
+	    s->offsets[s->noffs-1] = rpmdbGetIteratorOffset(mi);
+	}
+	rpmdbFreeIterator(mi);
+    }
+
+    s->offx = 0;
+    if (s->offsets != NULL && s->offx < s->noffs)
+	first = s->offsets[s->offx++];
+    else
+	first = 0;
+
+    if (!first) {
+	PyErr_SetString(pyrpmError, "cannot find first entry in database\n");
+	return NULL;
+    }
+
+    return Py_BuildValue("i", first);
+}
+
+static PyObject * rpmdbNext(rpmdbObject * s, PyObject * args) {
+    int where;
+
+    if (!PyArg_ParseTuple (args, "i", &where)) return NULL;
+
+    if (s->offsets == NULL || s->offx >= s->noffs) {
+	Py_INCREF(Py_None);
+	return Py_None;
+    }
+
+    where = s->offsets[s->offx++];
+
+    if (!where) {
+	Py_INCREF(Py_None);
+	return Py_None;
+    }
+
+    return Py_BuildValue("i", where);
+}
+
 static PyObject * handleDbResult(rpmdbMatchIterator mi) {
     PyObject * list;
 
diff --git a/rpm.spec b/rpm.spec
index 6b4ec0ecc..e15181da6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -8,7 +8,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.61
+Release: 0.62
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -264,6 +264,7 @@ fi
 * Sat Jul 29 2000 Jeff Johnson <jbj@redhat.com>
 - bail on firstkey/nextkey, there's a better way.
 - link rpm2cpio dynamically since cpio is linked dynamically.
+- re-resurrect firstkey/nextkey python bindings for up2date compatibility.
 
 * Fri Jul 28 2000 Jeff Johnson <jbj@redhat.com>
 - resurrect firstkey/nextkey python bindings.