python: gilding lilies.

CVS patchset: 5915
CVS date: 2002/12/04 02:01:47

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index cb7c372fb729d66bda8f0eb0ace782cd6d7fa64a..e85b63cb3c41bc81af343fd6a9eb3be17ea29edd 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -936,6 +936,9 @@ IDTX IDTXload(rpmts ts, rpmTag tag)
 rpmMessage(RPMMESS_DEBUG, "IDTXload(%p, %d)\n", ts, tag);
     /*@-branchstate@*/
     mi = rpmtsInitIterator(ts, tag, NULL, 0);
+#ifdef NOTYET
+    (void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey');
+#endif
     while ((h = rpmdbNextIterator(mi)) != NULL) {
        rpmTagType type = RPM_NULL_TYPE;
        int_32 count = 0;

diff --git a/po/cs.po b/po/cs.po
index 9d3ddbbd2afc2cff5ba2a3fe924bed05074f74a2..3de95293f0bb7e02e8016ccb8ea9aef94575750e 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2278,7 +2278,7 @@ msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2612,7 +2612,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "vytvoøení zdrojového a binárního balíèku z <tar_soubor>"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2647,7 +2647,7 @@ msgstr "nemohu vytvo
 msgid "Installing %s\n"
 msgstr "øádek: %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/da.po b/po/da.po
index 0d406407594b3ab482808ec24671226c27e19818..f4f45b3bd9a68fd88c01720bc15d91ac466e4caa 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -2291,7 +2291,7 @@ msgid "can't query %s: %s\n"
 msgstr "kunne ikke forespørge %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2625,7 +2625,7 @@ msgstr "filen %s kr
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2659,7 +2659,7 @@ msgstr "kunne ikke 
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/de.po b/po/de.po
index 7cc5ee68ba5b6f4b40395921a006c4fe8b44698d..9fbba5b1508ed09605f648a72f7110c2799d81be 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2452,7 +2452,7 @@ msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2793,7 +2793,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2828,7 +2828,7 @@ msgstr "Fehler: kann %s nicht 
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index bc89a519de15d241cd21d40f45358867193f4474..3145822dd267e34283222cfc0f5d3ffb7bc4ee78 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -2335,7 +2335,7 @@ msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2667,7 +2667,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2702,7 +2702,7 @@ msgstr "virhe: en voi avata %s\n"
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 4de0c9c08ae9f528dfc431ec21ffabb0bcc8da15..d834e1cf96d65b1a95e1ce725f6525e8562927f4 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2374,7 +2374,7 @@ msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2706,7 +2706,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2740,7 +2740,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/gl.po b/po/gl.po
index 5c32b3e431f67336ad7c1c5d3aca9c306dd9ccc7..a62b7cbaac5f55c4d677f8fea2369ccc4e384ef4 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -2202,7 +2202,7 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2528,7 +2528,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr ""
@@ -2561,7 +2561,7 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index 612947475d09cb4682b9b8d2f01b5abf952ef518..49bc426df564a8da1a005ed1c6dfb095d5a5dfe8 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -2229,7 +2229,7 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2556,7 +2556,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2590,7 +2590,7 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index c48ba714df23183aa0c39486dc9574e93ba67b6d..b721cdeae469f5ac1a1fdf8d8279267d9b3fc5f8 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2371,7 +2371,7 @@ msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2707,7 +2707,7 @@ msgstr "
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2741,7 +2741,7 @@ msgstr "%s 
 msgid "Installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/ko.po b/po/ko.po
index e0d9e3e15b493c3a7aa08a8bae59dd54d51c7d01..eceb9c727102d0d1f719f2464a478d97b9e9a2e2 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -2266,7 +2266,7 @@ msgid "can't query %s: %s\n"
 msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2600,7 +2600,7 @@ msgstr "%s 
 msgid "found %d source and %d binary packages\n"
 msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2634,7 +2634,7 @@ msgstr "%s(
 msgid "Installing %s\n"
 msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/no.po b/po/no.po
index 3ed59708addad8d27d031c8e9c2f2c70de1481bc..7df352626dbc0eac55551014bbc0c3ce5debb622 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2256,7 +2256,7 @@ msgid "can't query %s: %s\n"
 msgstr "kan ikke spørre på %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2585,7 +2585,7 @@ msgstr "fil %s trenger en nyere versjon av RPM\n"
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2619,7 +2619,7 @@ msgstr "kan ikke 
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 0cb223dd313db39bf6ea422dcc40cf214414b423..9feea91d5e3716bcf70365ed046160b4c4bf8594 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2335,7 +2335,7 @@ msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2668,7 +2668,7 @@ msgstr "plik %s wymaga nowszej wersji RPM\n"
 msgid "found %d source and %d binary packages\n"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2702,7 +2702,7 @@ msgstr "nie mo
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/pt.po b/po/pt.po
index 76a6581da589791d8fec951122696aa06d824dcf..dc6e7a57f35b14b1493b05228667aa843e1a32dc 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -2278,7 +2278,7 @@ msgid "can't query %s: %s\n"
 msgstr "não consigo pesquisar o %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2612,7 +2612,7 @@ msgstr "o %s precisa duma vers
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2646,7 +2646,7 @@ msgstr "n
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6f4d704ffb8f99d0d3731606fe8bd273c2266d99..077c3181e65e111f69d7414539af9a4f84072164 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -2463,7 +2463,7 @@ msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2839,7 +2839,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2876,7 +2876,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/ro.po b/po/ro.po
index 0caf0996ce198cd39b29616495b9f6628381eaa0..602d81321a76c9df0cf76f8dd359ca1124fc6504 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2202,7 +2202,7 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2528,7 +2528,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr ""
@@ -2561,7 +2561,7 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index d8f25411223e152a3a2692bfab61cf1fe6452814..6b0a7ce3c51f95505b9adcb96743ce365a65205d 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2208,7 +2208,7 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2534,7 +2534,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr ""
@@ -2567,7 +2567,7 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index eee13fbc3b8c2fdacd996f0ffef5ab9ef7b7a497..6dd253f3fd03c14573818990da12b1b0a37ad824 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -2249,7 +2249,7 @@ msgid "can't query %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2578,7 +2578,7 @@ msgstr "
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
@@ -2611,7 +2611,7 @@ msgstr "
 msgid "Installing %s\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "ïÔËÁÔ ÐÁËÅÔÏ× (+%d/-%d) ÎÁ %-24.24s (0x%08x):\n"

diff --git a/po/sk.po b/po/sk.po
index d63a7ec71ec868d594f8dff17c33fa69bae6bf63..70208f4f8787fd4f59d69be8f5dfc86bf61b9d0b 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\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"
@@ -2333,7 +2333,7 @@ msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2666,7 +2666,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2700,7 +2700,7 @@ msgstr "nie je mo
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/sl.po b/po/sl.po
index 4552b647693a07fd9cab362c0c52e677abee4b0b..696d0d7d4ae721c7cade8393c1ce1bff62ee78ad 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.330 2002/12/03 02:57:31 jbj Exp $
+# $Id: sl.po,v 1.331 2002/12/04 02:02:22 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2333,7 +2333,7 @@ msgid "can't query %s: %s\n"
 msgstr "ni mo¾no poizvedeti o %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2668,7 +2668,7 @@ msgstr "datoteka %s zahteva novej
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2702,7 +2702,7 @@ msgstr "ni mo
 msgid "Installing %s\n"
 msgstr "Name¹èanje %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/sr.po b/po/sr.po
index 1ed5ce97c7121942ddf255c7402f054faf495ab0..cfad49dd373294460f2970735ae2f8666a2d5e55 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2326,7 +2326,7 @@ msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
@@ -2658,7 +2658,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2693,7 +2693,7 @@ msgstr "gre
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index 6973280a25e5777c62b157ba75ac14b7e9c2dd73..a80130d437e2ec8a7d9f6f2eba1e219369a4503c 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2233,7 +2233,7 @@ msgid "can't query %s: %s\n"
 msgstr "kan inte fråga %s: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2561,7 +2561,7 @@ msgstr "filen %s beh
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr "Ouppfyllda beroenden:\n"
@@ -2594,7 +2594,7 @@ msgstr "kan inte 
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Återställer paket (+%d/-%d) till %-24.24s (0x%08x):\n"

diff --git a/po/tr.po b/po/tr.po
index d60ee5f0c0b6416c673e523a860500ffeafed074..66616b1b4f851a8db79a0ff3748bb6402c4716f0 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 21:54-0500\n"
+"POT-Creation-Date: 2002-12-03 20:58-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -2296,7 +2296,7 @@ msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamýyor: %s\n"
 
 #: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
-#: lib/rpminstall.c:589 lib/rpminstall.c:1002 lib/rpmts.c:441
+#: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
@@ -2629,7 +2629,7 @@ msgstr "%s dosyas
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1227
+#: lib/rpminstall.c:631 lib/rpminstall.c:801 lib/rpminstall.c:1230
 #: tools/rpmgraph.c:202
 #, fuzzy
 msgid "Failed dependencies:\n"
@@ -2663,7 +2663,7 @@ msgstr "%s a
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: lib/rpminstall.c:1221
+#: lib/rpminstall.c:1224
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""

diff --git a/python/header-py.c b/python/header-py.c
index deb0f42112fb11bb6fe00bd90915e274a0443a62..0fbe998dca56e38da706ab46833205f5dd5fef79 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -585,7 +585,7 @@ static char hdr_doc[] =
  */
 /*@unchecked@*/ /*@observer@*/
 PyTypeObject hdr_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.hdr",                      /* tp_name */
        sizeof(hdrObject),              /* tp_size */

diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index d784c12d21c781056f768ac7be9af72b4bba9cc1..ffe2a52f83332de500e580fb49265353708bc663 100644 (file)
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -229,7 +229,7 @@ static char rpmdb_doc[] =
  */
 /*@-fullinitblock@*/
 PyTypeObject rpmdb_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.db",                       /* tp_name */
        sizeof(rpmdbObject),            /* tp_size */

diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 6ba9ab2f3c1809713fa22337506d444597568aca..0a8d6feb9da6c78c337b1bcf09bbce0ffe68b9f6 100644 (file)
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -156,17 +156,32 @@ rpmds_Next(rpmdsObject * s, PyObject *args)
     return result;
 }
 
-#ifdef NOTYET
+static PyObject *
+rpmds_SetNoPromote(rpmdsObject * s, PyObject * args)
+       /*@*/
+{
+    int nopromote;
+
+    if (!PyArg_ParseTuple(args, "i:SetNoPromote", &nopromote))
+       return NULL;
+    return Py_BuildValue("i", rpmdsSetNoPromote(s->ds, nopromote));
+}
+
 static PyObject *
 rpmds_Notify(rpmdsObject * s, PyObject * args)
        /*@*/
 {
-    if (!PyArg_ParseTuple(args, ":Notify"))
+    const char * where;
+    int rc;
+
+    if (!PyArg_ParseTuple(args, "si:Notify", &where, &rc))
        return NULL;
+    rpmdsNotify(s->ds, where, rc);
     Py_INCREF(Py_None);
     return Py_None;
 }
 
+#ifdef NOTYET
 static PyObject *
 rpmds_Problem(rpmdsObject * s, PyObject * args)
        /*@*/
@@ -200,9 +215,11 @@ static struct PyMethodDef rpmds_methods[] = {
  {"next",      (PyCFunction)rpmds_Next,        METH_VARARGS,
 "ds.next() -> (N, EVR, Flags)\n\
 - Retrieve next dependency triple.\n" }, 
-#ifdef NOTYET
+ {"SetNoPromote",(PyCFunction)rpmds_SetNoPromote, METH_VARARGS,
+       NULL},
  {"Notify",    (PyCFunction)rpmds_Notify,      METH_VARARGS,
        NULL},
+#ifdef NOTYET
  {"Problem",   (PyCFunction)rpmds_Problem,     METH_VARARGS,
        NULL},
 #endif

diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index 9582cdeb5edb0a2b4f3783bc9810ddd2cf628a67..0652824c05ff825730d225b7db876f826fc53bfb 100644 (file)
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -179,7 +179,7 @@ static char rpmfd_doc[] =
  */
 /*@-fullinitblock@*/
 PyTypeObject rpmfd_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.fd",                       /* tp_name */
        sizeof(rpmfdObject),            /* tp_size */

diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 24f5d0d2ad5e667eebd71fdb9cd86c62be678051..3af37a7bf8d6ab0a8b705a77c68a56356f7430fc 100644 (file)
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -230,7 +230,7 @@ static char rpmmi_doc[] =
  */
 /*@-fullinitblock@*/
 PyTypeObject rpmmi_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.mi",                       /* tp_name */
        sizeof(rpmmiObject),            /* tp_size */

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index c84f9fb586a5613bb89a644e2a6e762a2836a548..c134d3b8f200f012ee2e3a9800d878eaa74e002b 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -576,6 +576,9 @@ void initrpm(void)
     REGISTER_ENUM(_RPMVSF_NOHEADER);
     REGISTER_ENUM(_RPMVSF_NOPAYLOAD);
 
+    REGISTER_ENUM(TR_ADDED);
+    REGISTER_ENUM(TR_REMOVED);
+
     PyDict_SetItemString(d, "RPMAL_NOMATCH", o=PyInt_FromLong( (long)RPMAL_NOMATCH ));
     Py_DECREF(o);
 }

diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index 7a0ac8e2167607a8018b6d5bb27c941794319091..8cd19eb7a03696583e55cfa78b6b4efb1f32aa6b 100644 (file)
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -26,10 +26,11 @@
  *
  * Elements of a transaction set are accessible after being added. Each
  * element carries descriptive information about the added element as well
- * as a file info set and dependency sets for each of the 4 typeof dependency.
+ * as a file info set and dependency sets for each of the 4 types of dependency.
  *
  * The rpmte class contains the following methods:
  *
+ * - te.Type() Return transaction element type (TR_ADDED|TR_REMOVED).
  * - te.N()    Return package name.
  * - te.E()    Return package epoch.
  * - te.V()    Return package version.
@@ -41,7 +42,12 @@
  * - te.Depth()        Return the level in the dependency tree (after ordering).
  * - te.Npreds() Return the number of package prerequisites (after ordering).
  * - te.Degree() Return the parent's degree + 1.
- * - te.AddedKey() Return the packages associated key.
+ * - te.Parent() Return the parent element index.
+ * - te.Tree() Return the root dependency tree index.
+ * - te.AddedKey() Return the added package index (TR_ADDED).
+ * - te.DependsOnKey() Return the package index for the added package (TR_REMOVED).
+ * - te.DBOffset() Return the Packages database instance number (TR_REMOVED)
+ * - te.Key()  Return the associated opaque key, i.e. 2nd arg ts.addInstall().
  * - te.DS(tag)        Return package dependency set.
  * @param tag  'Providename', 'Requirename', 'Obsoletename', 'Conflictname'
  * - te.FI(tag)        Return package file info set.
@@ -58,6 +64,14 @@ rpmte_Debug(/*@unused@*/ rpmteObject * s, /*@unused@*/ PyObject * args)
     return Py_None;
 }
 
+static PyObject *
+rpmte_TEType(rpmteObject * s, PyObject * args)
+       /*@*/
+{
+    if (!PyArg_ParseTuple(args, ":TEType")) return NULL;
+    return Py_BuildValue("i", rpmteType(s->te));
+}
+
 static PyObject *
 rpmte_N(rpmteObject * s, PyObject * args)
        /*@*/
@@ -146,6 +160,22 @@ rpmte_Degree(rpmteObject * s, PyObject * args)
     return Py_BuildValue("i", rpmteDegree(s->te));
 }
 
+static PyObject *
+rpmte_Parent(rpmteObject * s, PyObject * args)
+       /*@*/
+{
+    if (!PyArg_ParseTuple(args, ":Parent")) return NULL;
+    return Py_BuildValue("i", rpmteParent(s->te));
+}
+
+static PyObject *
+rpmte_Tree(rpmteObject * s, PyObject * args)
+       /*@*/
+{
+    if (!PyArg_ParseTuple(args, ":Tree")) return NULL;
+    return Py_BuildValue("i", rpmteTree(s->te));
+}
+
 static PyObject *
 rpmte_AddedKey(rpmteObject * s, PyObject * args)
        /*@*/
@@ -251,6 +281,9 @@ rpmte_FI(rpmteObject * s, PyObject * args)
 static struct PyMethodDef rpmte_methods[] = {
     {"Debug",  (PyCFunction)rpmte_Debug,       METH_VARARGS,
         NULL},
+    {"Type",   (PyCFunction)rpmte_TEType,      METH_VARARGS,
+"te.Type() -> Type\n\
+- Return element type (rpm.TR_ADDED | rpm.TR_REMOVED).\n" },
     {"N",      (PyCFunction)rpmte_N,           METH_VARARGS,
 "te.N() -> N\n\
 - Return element name.\n" },
@@ -280,6 +313,10 @@ static struct PyMethodDef rpmte_methods[] = {
         NULL},
     {"Degree", (PyCFunction)rpmte_Degree,      METH_VARARGS,
         NULL},
+    {"Parent", (PyCFunction)rpmte_Parent,      METH_VARARGS,
+        NULL},
+    {"Tree",   (PyCFunction)rpmte_Tree,        METH_VARARGS,
+        NULL},
     {"AddedKey",(PyCFunction)rpmte_AddedKey,   METH_VARARGS,
         NULL},
     {"DependsOnKey",(PyCFunction)rpmte_DependsOnKey,   METH_VARARGS,
@@ -301,6 +338,23 @@ static struct PyMethodDef rpmte_methods[] = {
 
 /* ---------- */
 
+static int
+rpmte_print(rpmteObject * s, FILE * fp, /*@unused@*/ int flags)
+        /*@globals fileSystem @*/
+        /*@modifies s, fp, fileSystem @*/
+{
+    const char * tstr;
+    if (!(s && s->te))
+       return -1;
+    switch (rpmteType(s->te)) {
+    case TR_ADDED:     tstr = "++";    break;
+    case TR_REMOVED:   tstr = "--";    break;
+    default:           tstr = "??";    break;
+    }
+    fprintf(fp, "%s %s %s", tstr, rpmteNEVR(s->te), rpmteA(s->te));
+    return 0;
+}
+
 /** \ingroup python
  */
 static PyObject * rpmte_getattr(rpmteObject * o, char * name)
@@ -319,13 +373,13 @@ static char rpmte_doc[] =
  */
 /*@-fullinitblock@*/
 PyTypeObject rpmte_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.te",                       /* tp_name */
        sizeof(rpmteObject),            /* tp_size */
        0,                              /* tp_itemsize */
        (destructor)0,                  /* tp_dealloc */
-       0,                              /* tp_print */
+       (printfunc) rpmte_print,        /* tp_print */
        (getattrfunc) rpmte_getattr,    /* tp_getattr */
        (setattrfunc)0,                 /* tp_setattr */
        0,                              /* tp_compare */

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index bdfff3916a1864d5a0e76b560c0a32723ee077f3..762fa5e6221b1614630286aeb4467340fd420487 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -235,9 +235,8 @@ fprintf(stderr, "*** rpmts_AddInstall(%p,%p,%p,%s) ts %p\n", s, h, key, how, s->
        rpmtsAddInstallElement(s->ts, hdrGetHeader(h), key, isUpgrade, NULL);
 
     /* This should increment the usage count for me */
-    if (key) {
+    if (key)
        PyList_Append(s->keyList, key);
-    }
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -375,7 +374,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
     cbInfo._save = PyEval_SaveThread();
 
     /* XXX resurrect availablePackages one more time ... */
-    rpmalMakeIndex(&s->ts->availablePackages);
+    rpmalMakeIndex(s->ts->availablePackages);
 
     xx = rpmtsCheck(s->ts);
     ps = rpmtsProblems(s->ts);
@@ -1088,9 +1087,8 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet);
     rc = rpmtsRun(s->ts, NULL, s->ignoreSet);
     ps = rpmtsProblems(s->ts);
 
-    if (cbInfo.cb) {
+    if (cbInfo.cb)
        (void) rpmtsSetNotifyCallback(s->ts, NULL, NULL);
-    }
 
     PyEval_RestoreThread(cbInfo._save);
 
@@ -1252,13 +1250,17 @@ static struct PyMethodDef rpmts_methods[] = {
 - Set control bit(s) for ignoring problems found by ts.run().\n\
   Note: This method replaces the 2nd argument to the old ts.run()\n" },
  {"run",       (PyCFunction) rpmts_Run,        METH_VARARGS,
-       NULL },
+"ts.run(callback, data) -> (problems)\n\
+- Run a transaction set, returning list of problems found.\n\
+  Note: The callback may not be None.\n" },
  {"clean",     (PyCFunction) rpmts_Clean,      METH_VARARGS,
        NULL },
  {"IDTXload",  (PyCFunction) rpmts_IDTXload,   METH_VARARGS,
-       NULL },
+"ts.IDTXload() -> ((tid,hdr,instance)+)\n\
+- Return list of installed packages reverse sorted by transaction id.\n" },
  {"IDTXglob",  (PyCFunction) rpmts_IDTXglob,   METH_VARARGS,
-       NULL },
+"ts.IDTXglob() -> ((tid,hdr,instance)+)\n\
+- Return list of removed packages reverse sorted by transaction id.\n" },
  {"rollback",  (PyCFunction) rpmts_Rollback,   METH_VARARGS,
        NULL },
  {"openDB",    (PyCFunction) rpmts_OpenDB,     METH_VARARGS,
@@ -1372,7 +1374,7 @@ static char rpmts_doc[] =
  */
 /*@-fullinitblock@*/
 PyTypeObject rpmts_Type = {
-       PyObject_HEAD_INIT(NULL)
+       PyObject_HEAD_INIT(&PyType_Type)
        0,                              /* ob_size */
        "rpm.ts",                       /* tp_name */
        sizeof(rpmtsObject),            /* tp_size */