- python: force dbMatch() h# key to be 32 bit integer (#146477).

CVS patchset: 7720
CVS date: 2005/01/28 20:25:01

diff --git a/CHANGES b/CHANGES
index 3214b73..ddc41e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@
        - changes to build on Mac OS X using darwinports neon/beecrypt.
        - blueprint rpm-4_4 and HEAD to minimize diff spew.
        - add missing #if defined(ENABLE_NLS) (#146184).
+       - python: force dbMatch() h# key to be 32 bit integer (#146477).
 
 4.3.3 -> 4.4:
        - pentium3/pentium4 arch support (pluto@PLD).

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 30a8de5..20c2401 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -1347,7 +1347,8 @@ rpmts_Match(rpmtsObject * s, PyObject * args, PyObject * kwds)
     PyObject *TagN = NULL;
     PyObject *Key = NULL;
     char *key = NULL;
-    long lkey = 0;
+/* XXX lkey *must* be a 32 bit integer, int "works" on all known platforms. */
+    int lkey = 0;
     int len = 0;
     int tag = RPMDBI_PACKAGES;
     char * kwlist[] = {"tagNumber", "key", NULL};

diff --git a/rpm.spec.in b/rpm.spec.in
index cefb74c..1cab0f8 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.10
+Release: 0.12
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -494,6 +494,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Fri Jan 28 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.12
+- python: force dbMatch() h# key to be 32 bit integer (#146477).
+
 * Tue Jan 25 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.10
 - more macosx fiddles.
 - move global /var/lock/rpm/transaction to dbpath.