summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--popt/po/cs.po2
-rw-r--r--popt/po/da.po2
-rw-r--r--popt/po/de.po2
-rw-r--r--popt/po/es.po2
-rw-r--r--popt/po/eu_ES.po2
-rw-r--r--popt/po/fi.po2
-rw-r--r--popt/po/fr.po2
-rw-r--r--popt/po/gl.po2
-rw-r--r--popt/po/hu.po2
-rw-r--r--popt/po/id.po2
-rw-r--r--popt/po/is.po2
-rw-r--r--popt/po/it.po2
-rw-r--r--popt/po/ja.po2
-rw-r--r--popt/po/ko.po2
-rw-r--r--popt/po/no.po2
-rw-r--r--popt/po/pl.po2
-rw-r--r--popt/po/popt.pot2
-rw-r--r--popt/po/pt.po2
-rw-r--r--popt/po/pt_BR.po2
-rw-r--r--popt/po/ro.po2
-rw-r--r--popt/po/ru.po2
-rw-r--r--popt/po/sk.po2
-rw-r--r--popt/po/sl.po2
-rw-r--r--popt/po/sr.po2
-rw-r--r--popt/po/sv.po2
-rw-r--r--popt/po/tr.po2
-rw-r--r--popt/po/uk.po2
-rw-r--r--popt/po/wa.po2
-rw-r--r--popt/po/zh.po2
-rw-r--r--popt/po/zh_CN.GB2312.po2
-rw-r--r--popt/popthelp.c8
-rw-r--r--python/rpmdb-py.c2
-rw-r--r--python/rpmdb-py.h2
-rw-r--r--python/rpmmodule.c20
-rw-r--r--python/rpmrc-py.c119
-rw-r--r--python/rpmrc-py.h6
-rw-r--r--python/rpmts-py.c7
-rw-r--r--rpm.spec.in6
38 files changed, 150 insertions, 80 deletions
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 40bbdf434..c86cd32d7 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-07-24 00:03+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
diff --git a/popt/po/da.po b/popt/po/da.po
index 92c69875f..974b4fff9 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
"Last-Translator: Martin Hansen <mah@k64.dk>\n"
"Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/popt/po/de.po b/popt/po/de.po
index e9730700e..7bd823121 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/es.po b/popt/po/es.po
index 53a05a5b1..bbbf7eda0 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index e9730700e..7bd823121 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/fi.po b/popt/po/fi.po
index e9730700e..7bd823121 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/fr.po b/popt/po/fr.po
index e9730700e..7bd823121 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/gl.po b/popt/po/gl.po
index f2a23ad03..d058039af 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-01-17 01:01+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index 4a985cf64..0f19c6430 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2000-08-03 23:26+0200\n"
"Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
"Language-Team: Hungarian\n"
diff --git a/popt/po/id.po b/popt/po/id.po
index e9730700e..7bd823121 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/is.po b/popt/po/is.po
index 068637323..6cf08c8b7 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-06-08 01:35+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/popt/po/it.po b/popt/po/it.po
index e9730700e..7bd823121 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/ja.po b/popt/po/ja.po
index e9730700e..7bd823121 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 7e5b1af03..6d273f7a4 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-09-06 20:06+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/popt/po/no.po b/popt/po/no.po
index 5501a123a..ee34aa83a 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-06-27 11:05+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index e9730700e..7bd823121 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index b60a954e5..98699ad64 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 54f91d114..156435fcd 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2002-02-13 18:32+0000\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index e9730700e..7bd823121 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 88a5dfc2d..e6a8b34e8 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2000-06-14 23:23+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index c8e0cc5f5..a7d719eb0 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-07-05 21:00-0500\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index d52143405..69dc5e4db 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 1999-08-04 21:40+0200\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index d32e36cfe..ea5ea8873 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2000-09-05 12:30+0200\n"
"Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index e9730700e..7bd823121 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/sv.po b/popt/po/sv.po
index c7b306244..1bf94d15b 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2001-07-12 22:26+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index d958fd1dc..ea3323336 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 2000-02-11 13:01+0200\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 4c47cb5ff..32bfb6ed5 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 1999-09-30 16:54+0200\n"
"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index 6db9d081b..4752adeb6 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 1999-03-18 23:11+0100\n"
"Last-Translator: Nobody yet\n"
"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index e9730700e..7bd823121 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-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"
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 4f3deeb5f..b7cf54ccf 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
"PO-Revision-Date: 1999-11-11 05:04+0800\n"
"Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
"Language-Team: TLDN\n"
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 801dca5ac..bb00e92de 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -15,10 +15,10 @@
/**
* Display arguments.
* @param con context
- * @param foo
+ * @param foo (unused)
* @param key option(s)
- * @param arg
- * @param data
+ * @param arg (unused)
+ * @param data (unused)
*/
static void displayArgs(poptContext con,
/*@unused@*/ enum poptCallbackReason foo,
@@ -526,6 +526,7 @@ static int singleOptionUsage(FILE * fp, int cursor,
const char * item = shortStr;
const char * argDescrip = getArgDescrip(opt, translation_domain);
+fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, translation_domain);
if (opt->shortName!= '\0' ) {
if (!(opt->argInfo & POPT_ARG_MASK))
return cursor; /* we did these already */
@@ -602,6 +603,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
/*@globals fileSystem @*/
/*@modifies *fp, fileSystem @*/
{
+fprintf(stderr, "*** singleTableUsage(%p,%p,%d,%p,%p)\n", con, fp, cursor, opt, translation_domain);
/*@-branchstate@*/ /* FIX: W2DO? */
if (opt != NULL)
for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index 4921fcea1..d784c12d2 100644
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -275,6 +275,7 @@ PyTypeObject rpmdb_Type = {
};
/*@=fullinitblock@*/
+#ifdef _LEGACY_BINDINGS_TOO
rpmdb dbFromDb(rpmdbObject * db)
{
return db->db;
@@ -322,5 +323,6 @@ PyObject * rebuildDB (/*@unused@*/ PyObject * self, PyObject * args)
return Py_BuildValue("i", rpmdbRebuild(rootDir, NULL, NULL));
}
+#endif
/*@}*/
diff --git a/python/rpmdb-py.h b/python/rpmdb-py.h
index 8c088d5d9..87e4a0528 100644
--- a/python/rpmdb-py.h
+++ b/python/rpmdb-py.h
@@ -24,6 +24,7 @@ struct rpmdbObject_s {
/*@unchecked@*/
extern PyTypeObject rpmdb_Type;
+#ifdef _LEGACY_BINDINGS_TOO
rpmdb dbFromDb(rpmdbObject * db)
/*@*/;
@@ -32,5 +33,6 @@ rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args)
PyObject * rebuildDB (PyObject * self, PyObject * args)
/*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/;
+#endif
#endif
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 3952b092f..b6d3bdf26 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -178,6 +178,7 @@ static PyObject * findUpgradeSet(PyObject * self, PyObject * args)
return result;
}
+#ifdef _LEGACY_BINDINGS_TOO
/**
*/
static PyObject * rpmInitDB(PyObject * self, PyObject * args)
@@ -202,6 +203,7 @@ static PyObject * rpmInitDB(PyObject * self, PyObject * args)
Py_INCREF(Py_None);
return(Py_None);
}
+#endif
/**
*/
@@ -323,8 +325,10 @@ static PyMethodDef rpmModuleMethods[] = {
"rpm.TransactionSet([rootDir, [db]]) -> ts\n\
- Create a transaction set.\n" },
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
{ "newrc", (PyCFunction) rpmrc_Create, METH_VARARGS|METH_KEYWORDS,
NULL },
+#endif
{ "addMacro", (PyCFunction) rpmrc_AddMacro, METH_VARARGS,
NULL },
{ "delMacro", (PyCFunction) rpmrc_DelMacro, METH_VARARGS,
@@ -340,12 +344,14 @@ static PyMethodDef rpmModuleMethods[] = {
NULL },
{ "rhnLoad", (PyCFunction) rhnLoad, METH_VARARGS,
NULL },
+#ifdef _LEGACY_BINDINGS_TOO
{ "initdb", (PyCFunction) rpmInitDB, METH_VARARGS,
NULL },
{ "opendb", (PyCFunction) rpmOpenDB, METH_VARARGS,
NULL },
{ "rebuilddb", (PyCFunction) rebuildDB, METH_VARARGS,
NULL },
+#endif
{ "mergeHeaderListFromFD", (PyCFunction) rpmMergeHeadersFromFD, METH_VARARGS,
NULL },
{ "readHeaderListFromFD", (PyCFunction) rpmHeaderFromFD, METH_VARARGS,
@@ -386,6 +392,7 @@ void initrpm(void)
struct headerSprintfExtension_s * ext;
PyObject * m;
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
if (PyType_Ready(&hdr_Type) < 0) return;
if (PyType_Ready(&rpmal_Type) < 0) return;
if (PyType_Ready(&rpmdb_Type) < 0) return;
@@ -399,6 +406,7 @@ void initrpm(void)
if (PyType_Ready(&rpmte_Type) < 0) return;
if (PyType_Ready(&rpmts_Type) < 0) return;
+#endif
m = Py_InitModule3("rpm", rpmModuleMethods, rpm__doc__);
if (m == NULL)
@@ -418,6 +426,7 @@ void initrpm(void)
PyDict_SetItemString(d, "error", pyrpmError);
#endif
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
Py_INCREF(&hdr_Type);
PyModule_AddObject(m, "hdr", (PyObject *) &hdr_Type);
@@ -447,6 +456,17 @@ void initrpm(void)
Py_INCREF(&rpmts_Type);
PyModule_AddObject(m, "ts", (PyObject *) &rpmts_Type);
+#else
+ hdr_Type.ob_type = &PyType_Type;
+ rpmal_Type.ob_type = &PyType_Type;
+ rpmdb_Type.ob_type = &PyType_Type;
+ rpmds_Type.ob_type = &PyType_Type;
+ rpmfd_Type.ob_type = &PyType_Type;
+ rpmfi_Type.ob_type = &PyType_Type;
+ rpmmi_Type.ob_type = &PyType_Type;
+ rpmte_Type.ob_type = &PyType_Type;
+ rpmts_Type.ob_type = &PyType_Type;
+#endif
dict = PyDict_New();
diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c
index ad1292db9..729e1d366 100644
--- a/python/rpmrc-py.c
+++ b/python/rpmrc-py.c
@@ -17,21 +17,26 @@ extern PyTypeObject PyDictIter_Type;
#include <rpmcli.h>
-#include "header-py.h"
-#include "rpmal-py.h"
-#include "rpmdb-py.h"
-#include "rpmds-py.h"
-#include "rpmfd-py.h"
-#include "rpmfi-py.h"
-#include "rpmmi-py.h"
#include "rpmrc-py.h"
-#include "rpmte-py.h"
-#include "rpmts-py.h"
+
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
+#include "header-py.h" /* XXX debug only */
+#include "rpmal-py.h" /* XXX debug only */
+#include "rpmdb-py.h" /* XXX debug only */
+#include "rpmds-py.h" /* XXX debug only */
+#include "rpmfd-py.h" /* XXX debug only */
+#include "rpmfi-py.h" /* XXX debug only */
+#include "rpmmi-py.h" /* XXX debug only */
+#include "rpmte-py.h" /* XXX debug only */
+#include "rpmts-py.h" /* XXX debug only */
+#endif
#include "debug.h"
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
/*@unchecked@*/
static int _rc_debug = 0;
+#endif
/** \ingroup python
* \class Rpmrc
@@ -45,6 +50,38 @@ static int _rc_debug = 0;
/**
*/
+PyObject * rpmrc_AddMacro(/*@unused@*/ PyObject * self, PyObject * args)
+{
+ char * name, * val;
+
+ if (!PyArg_ParseTuple(args, "ss:AddMacro", &name, &val))
+ return NULL;
+
+ addMacro(NULL, name, NULL, val, -1);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+/**
+ */
+PyObject * rpmrc_DelMacro(/*@unused@*/ PyObject * self, PyObject * args)
+{
+ char * name;
+
+ if (!PyArg_ParseTuple(args, "s:DelMacro", &name))
+ return NULL;
+
+ delMacro(NULL, name);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
+/**
+ */
+
static const char * lbl(void * s)
/*@*/
{
@@ -87,36 +124,6 @@ static const char * lbl(void * s)
/**
*/
-PyObject * rpmrc_AddMacro(/*@unused@*/ PyObject * self, PyObject * args)
-{
- char * name, * val;
-
- if (!PyArg_ParseTuple(args, "ss:AddMacro", &name, &val))
- return NULL;
-
- addMacro(NULL, name, NULL, val, -1);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-/**
- */
-PyObject * rpmrc_DelMacro(/*@unused@*/ PyObject * self, PyObject * args)
-{
- char * name;
-
- if (!PyArg_ParseTuple(args, "s:DelMacro", &name))
- return NULL;
-
- delMacro(NULL, name);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-/**
- */
static PyObject *
rpmrc_getstate(rpmrcObject *s, PyObject *args)
/*@*/
@@ -391,6 +398,7 @@ if (_rc_debug)
fprintf(stderr, "*** rpmrc_new(%p[%s],%p,%p) ret %p[%s]\n", subtype, lbl(subtype), args, kwds, ns, lbl(ns));
return ns;
}
+#endif
/**
*/
@@ -401,12 +409,14 @@ static struct PyMethodDef rpmrc_methods[] = {
NULL },
{ "delMacro", (PyCFunction) rpmrc_DelMacro, METH_VARARGS,
NULL },
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
{ "getstate", (PyCFunction) rpmrc_getstate, METH_VARARGS,
"getstate() -> state"},
{ "setstate", (PyCFunction) rpmrc_setstate, METH_VARARGS,
"setstate(state)"},
{ "next", (PyCFunction) rpmrc_next, METH_VARARGS,
"next() -- get the next value, or raise StopIteration"},
+#endif
{NULL, NULL} /* sentinel */
};
/*@=fullinitblock@*/
@@ -414,6 +424,7 @@ static struct PyMethodDef rpmrc_methods[] = {
/** \ingroup python
*/
/*@-fullinitblock@*/
+#if Py_TPFLAGS_HAVE_ITER
PyTypeObject rpmrc_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
@@ -437,7 +448,6 @@ PyTypeObject rpmrc_Type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */
rpmrc_doc, /* tp_doc */
-#if Py_TPFLAGS_HAVE_ITER
rpmrc_traverse, /* tp_traverse */
rpmrc_clear, /* tp_clear */
rpmrc_richcompare, /* tp_richcompare */
@@ -457,13 +467,40 @@ PyTypeObject rpmrc_Type = {
rpmrc_new, /* tp_new */
rpmrc_free, /* tp_free */
0, /* tp_is_gc */
-#endif
};
+#else
+PyTypeObject rpmrc_Type = {
+ PyObject_HEAD_INIT(&PyType_Type)
+ 0, /* ob_size */
+ "rpm.rc", /* tp_name */
+ sizeof(rpmrcObject), /* tp_size */
+ 0, /* tp_itemsize */
+ 0, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ 0, /* tp_flags */
+ 0 /* tp_doc */
+};
+#endif
/*@=fullinitblock@*/
+#if Py_TPFLAGS_HAVE_ITER
PyObject * rpmrc_Create(/*@unused@*/ PyObject * self, PyObject *args, PyObject *kwds)
{
return rpmrc_new(&rpmrc_Type, args, kwds);
}
+#endif
/*@}*/
diff --git a/python/rpmrc-py.h b/python/rpmrc-py.h
index 92e95ac71..50253866b 100644
--- a/python/rpmrc-py.h
+++ b/python/rpmrc-py.h
@@ -12,8 +12,12 @@ typedef struct rpmrcObject_s rpmrcObject;
/** \ingroup python
*/
struct rpmrcObject_s {
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
PyDictObject dict;
int state;
+#else
+ PyObject_HEAD
+#endif
} ;
/*@unchecked@*/
@@ -26,7 +30,9 @@ PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args)
/*@globals rpmGlobalMacroContext, _Py_NoneStruct @*/
/*@modifies rpmGlobalMacroContext, _Py_NoneStruct @*/;
+#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
PyObject * rpmrc_Create(PyObject * self, PyObject * args, PyObject * kwds)
/*@*/;
+#endif
#endif
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 1f6034733..30bbc0864 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -495,7 +495,6 @@ fprintf(stderr, "*** rpmts_HdrCheck(%p) ts %p\n", s, s->ts);
}
uh = PyString_AsString(blob);
uc = PyString_Size(blob);
-fprintf(stderr, "*** uh %p uc %d\n", uh, uc);
rpmrc = headerCheck(s->ts, uh, uc, &msg);
@@ -668,6 +667,7 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p flags %x ignore %x\n", s, s->ts, s->ts-
return list;
}
+#if Py_TPFLAGS_HAVE_ITER
static PyObject *
rpmts_iter(rpmtsObject * s)
/*@modifies s @*/
@@ -675,13 +675,10 @@ rpmts_iter(rpmtsObject * s)
if (_rpmts_debug)
fprintf(stderr, "*** rpmts_iter(%p) ts %p\n", s, s->ts);
-#ifdef DYING
- s->tsi = rpmtsiInit(s->ts);
- s->tsiFilter = 0;
-#endif
Py_INCREF(s);
return (PyObject *)s;
}
+#endif
/**
* @todo Add TR_ADDED filter to iterator.
diff --git a/rpm.spec.in b/rpm.spec.in
index 6a7f88b62..8a60ad7eb 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
-Release: 0.55
+Release: 0.56
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@@ -514,6 +514,10 @@ fi
%{__prefix}/include/popt.h
%changelog
+* Thu Jul 25 2002 Jeff Johnson <jbj@redhat.com>
+- python: remove the old initdb/rebuilddb methods, use ts.fooDB().
+- python: 1st crack at backport to 1.5.2.
+
* Wed Jul 24 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.55
- imbue %ghost with missingok attribute with --verify (#68933).
- fix: segfault if given a text file as 2nd arg to -Uvh (#69508).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 11:06:54 +0000