RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 16-Sep-2008 22:46:54
Branch: HEAD Handle: 2008091620465301
Modified files:
rpm CHANGES
rpm/rpmdb tagname.c
Log:
- jbj: fix: tagType() with multiple aliases returned the wrong type.
Summary:
Revision Changes Path
1.2549 +1 -0 rpm/CHANGES
1.32 +2 -3 rpm/rpmdb/tagname.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2548 -r1.2549 CHANGES
--- rpm/CHANGES 16 Sep 2008 06:46:03 -0000 1.2548
+++ rpm/CHANGES 16 Sep 2008 20:46:53 -0000 1.2549
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: fix: tagType() with multiple aliases returned the wrong type.
- rpm.org: don't allow multiple definition of PatchX or SourceX
- proyvind: install headers required by other installed headers. (FIXME!)
- proyvind: unbreak rpm4compat.h wrt c++ function overrides.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/tagname.c
============================================================================
$ cvs diff -u -r1.31 -r1.32 tagname.c
--- rpm/rpmdb/tagname.c 3 Aug 2008 14:01:00 -0000 1.31
+++ rpm/rpmdb/tagname.c 16 Sep 2008 20:46:54 -0000 1.32
@@ -261,9 +261,8 @@
/* Make sure that the bsearch retrieve is stable. */
while (i > 0 && tag == _rpmTags.byValue[i-1]->val) {
i--;
- t--;
+ t = _rpmTags.byValue[i];
}
- t = _rpmTags.byValue[i];
s = (*_rpmTags.tagCanonicalize) (t->name);
strncpy(nameBuf, s, nameBufLen);
s = _free(s);
@@ -322,7 +321,7 @@
/* Make sure that the bsearch retrieve is stable. */
while (i > 0 && t->val == _rpmTags.byValue[i-1]->val) {
i--;
- t--;
+ t = _rpmTags.byValue[i];
}
return t->type;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
